bk commit into 5.0 tree (ramil:1.2297) BUG#22723

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-20 15:08:25+05:00, ramil@stripped +1 -0
  Fix for bug #22723: Host field blank when server started with skip-grant
  
  We set 'host_or_ip' to "" in the Security_context::skip_grants().
  
  

  sql/sql_show.cc@stripped, 2006-10-20 15:08:21+05:00, ramil@stripped +3 -1
    Fix for bug #22723: Host field blank when server started with skip-grant
      - as we set 'host_or_ip' to "" if skip-grant, use 'host' instead.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug22723/my50-bug22723

--- 1.328/sql/sql_show.cc	2006-10-20 15:08:35 +05:00
+++ 1.329/sql/sql_show.cc	2006-10-20 15:08:35 +05:00
@@ -1323,7 +1323,9 @@ void mysqld_list_processes(THD *thd,cons
 			"%s:%u", tmp_sctx->host_or_ip, tmp->peer_port);
 	}
 	else
-	  thd_info->host= thd->strdup(tmp_sctx->host_or_ip);
+	  thd_info->host= thd->strdup(tmp_sctx->host_or_ip[0] ? 
+                                      tmp_sctx->host_or_ip : 
+                                      tmp_sctx->host ? tmp_sctx->host : "");
         if ((thd_info->db=tmp->db))             // Safe test
           thd_info->db=thd->strdup(thd_info->db);
         thd_info->command=(int) tmp->command;