mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
Merge mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
into mysql.com:/usr/home/ram/work/bug22723/my51-bug22723
This commit is contained in:
commit
17828ea652
1 changed files with 3 additions and 1 deletions
|
@ -1664,7 +1664,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
|
|||
"%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;
|
||||
|
|
Loading…
Reference in a new issue