diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-31 13:28:44 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-31 13:28:44 +0400 |
| commit | 0c57f480282a427d5d03c8288f72c4f1f4826547 (patch) | |
| tree | a6c70bfe423900113b636425ef163a26a2425cd3 /sql/sql_show.cc | |
| parent | bc782093333a5dedeb2e19ff35b00fa1cb89eec9 (diff) | |
| parent | 4ba691b03c90c3d3af5445ef177fbbbd63efa8e7 (diff) | |
| download | mariadb-git-0c57f480282a427d5d03c8288f72c4f1f4826547.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b0f5489b2f4..f107a57fe2b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1323,7 +1323,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; |