posreview changing (SCRUM)

increased compatibility
postmerge changing


sql/sql_class.h:
  increased compatibility
sql/sql_show.cc:
  postmerge changing
vio/viosocket.c:
  increased compatibility

sql/sql_class.h

@@ -352,7 +352,7 @@ class THD :public ilink
    */
   char	  *host,*user,*priv_user,*db,*ip;
   /* remote (peer) port */
-  u_int16_t peer_port;
+  uint16 peer_port;
   /* Points to info-string that will show in SHOW PROCESSLIST */
   const char *proc_info;
   /* points to host if host is available, otherwise points to ip */

sql/sql_show.cc

@@ -1064,13 +1064,10 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
 	{
 	  if ((thd_info->host= thd->alloc(LIST_PROCESS_HOST_LEN+1)))
 	    snprintf((char *) thd_info->host, LIST_PROCESS_HOST_LEN, "%s:%u",
-		     (tmp->host ? tmp->host : tmp->ip), tmp->peer_port);
+		     thd->host_or_ip, tmp->peer_port);
 	}
 	else
-	  thd_info->host= thd->strdup(tmp->host ? tmp->host :
-				      (tmp->ip ? tmp->ip :
-				       (tmp->system_thread ? "none" :
-					"connecting host")));
+	  thd_info->host= thd->strdup(thd->host_or_ip);
         if ((thd_info->db=tmp->db))             // Safe test
           thd_info->db=thd->strdup(thd_info->db);
         thd_info->command=(int) tmp->command;

vio/viosocket.c

@@ -277,7 +277,7 @@ my_socket vio_fd(Vio* vio)
 }
 
 
-my_bool vio_peer_addr(Vio * vio, char *buf, u_int16_t *port)
+my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
 {
   DBUG_ENTER("vio_peer_addr");
   DBUG_PRINT("enter", ("sd: %d", vio->sd));