my5710.patch

--- mysql-5.7.10/client/auth_utils.cc	2015-12-16 17:47:41.000000000 +0000
+++ ../mysql-5.7.10/client/auth_utils.cc	2023-08-13 18:23:31.374019456 +0000
@@ -61,7 +61,7 @@
     getline(sin, option_value);
     trim(&option_value);
     if (option_name.length() > 0)
-      options->insert(make_pair<string, string >(option_name, option_value));
+      options->insert(make_pair(option_name, option_value));
   }
   return ALL_OK;
   } catch(...)
--- mysql-5.7.10/client/base/help_options.cc	2015-12-16 17:47:41.000000000 +0000
+++ ../mysql-5.7.10/client/base/help_options.cc	2023-08-13 18:20:55.247027074 +0000
@@ -74,10 +74,9 @@
 
   this->print_version_line();
 
-  std::string first_year_str=
-    (static_cast<std::ostringstream*>(&(
-    std::ostringstream() << this->m_program->get_first_release_year()))
-    ->str());
+  std::ostringstream s;
+  s << m_program->get_first_release_year();
+  string first_year_str(s.str());
   string copyright;
 
   if (first_year_str == COPYRIGHT_NOTICE_CURRENT_YEAR)
--- mysql-5.7.10/sql-common/client_authentication.cc	2015-12-16 17:47:41.000000000 +0000
+++ ../mysql-5.7.10/sql-common/client_authentication.cc	2023-08-13 18:09:33.183799137 +0000
@@ -84,7 +84,7 @@
 
   if (mysql->options.extension != NULL &&
       mysql->options.extension->server_public_key_path != NULL &&
-      mysql->options.extension->server_public_key_path != '\0')
+      mysql->options.extension->server_public_key_path[0] != '\0')
   {
     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
                         "r");
--- mysql-5.7.10/storage/innobase/include/univ.i	2015-12-16 17:47:41.000000000 +0000
+++ ../mysql-5.7.10/storage/innobase/include/univ.i	2023-08-13 18:03:27.151755863 +0000
@@ -417,7 +417,8 @@
 */
 
 /* Note that inside MySQL 'byte' is defined as char on Linux! */
-#define byte			unsigned char
+// #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