diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-02-27 20:31:54 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-02-27 20:31:54 +0200 |
| commit | b01f20db91e163cfebb2e5ecf743241074ab7355 (patch) | |
| tree | c242866cd480e42f46bf191ef72e087386613b8c /sql/sql_show.cc | |
| parent | e807bcf0e287c2ac729df010e56365800047e9f1 (diff) | |
| download | mariadb-git-b01f20db91e163cfebb2e5ecf743241074ab7355.tar.gz | |
posreview changing (SCRUM)
increased compatibility
postmerge changing
sql/sql_class.h:
increased compatibility
sql/sql_show.cc:
postmerge changing
vio/viosocket.c:
increased compatibility
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a47d99143b6..62977ab5fb2 100644 --- a/sql/sql_show.cc +++ b/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; |