Revert "Bug#25510805 - MYSQL CRASHES WHEN TRYING TO CONNECT FROM"

Author: dahlerlend

sql/hostname.cc

@@ -33,7 +33,6 @@
                                                 // sql_print_information
 #include "violite.h"                            // vio_getnameinfo,
                                                 // vio_get_normalized_ip_string
-#include <string>
 #ifdef	__cplusplus
 extern "C" {					// Because of SCO 3.2V4.2
 #endif
@@ -552,14 +551,6 @@ int ip_to_hostname(struct sockaddr_storage *ip_storage,
                   }
                   );
 
-  DBUG_EXECUTE_IF ("getnameinfo_fake_max_length",
-                  {
-                    std::string s(NI_MAXHOST, 'a');
-                    strcpy(hostname_buffer, s.c_str());
-                    err_code= 0;
-                  }
-                  );
-
   /*
   ===========================================================================
   DEBUG code only (end)

storage/perfschema/pfs.cc

@@ -41,8 +41,6 @@
 #include "sp_head.h"
 #include "pfs_digest.h"
 
-using std::min;
-
 /**
   @page PAGE_PERFORMANCE_SCHEMA The Performance Schema main page
   MySQL PERFORMANCE_SCHEMA implementation.
@@ -2020,8 +2018,7 @@ static void set_thread_account_v1(const char *user, int user_len,
   DBUG_ASSERT((uint) user_len <= sizeof(pfs->m_username));
   DBUG_ASSERT((host != NULL) || (host_len == 0));
   DBUG_ASSERT(host_len >= 0);
-
-  host_len= min<size_t>(host_len, sizeof(pfs->m_hostname));
+  DBUG_ASSERT((uint) host_len <= sizeof(pfs->m_hostname));
 
   if (unlikely(pfs == NULL))
     return;