diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-10-31 13:10:06 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-10-31 13:10:06 +0400 |
| commit | dd6b39026a0a644ab1f9bdf807162ad929258e1c (patch) | |
| tree | 3d3d9391d933270b33d2d7a3238ffe6b708e2ea1 /sql/sql_show.cc | |
| parent | 6c4f74eddd161aead927dcd8769a587c6f507c56 (diff) | |
| parent | 4ba691b03c90c3d3af5445ef177fbbbd63efa8e7 (diff) | |
| download | mariadb-git-dd6b39026a0a644ab1f9bdf807162ad929258e1c.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
into mysql.com:/usr/home/ram/work/bug22723/my51-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 30f494a48ac..3f947310200 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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; |