diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-19 21:56:14 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-19 21:56:14 +0200 |
| commit | 7517a59a6dac4580b1f7b5cf87abf6d75b096bbc (patch) | |
| tree | d69e3b047e341585048a562045623a1b77a71700 /sql/sql_show.cc | |
| parent | b4a0cdb8dea6fccacc086f0a043105b3cef6b38c (diff) | |
| parent | 0847c4f90e732378b6e4b37fe819c92bda870067 (diff) | |
| download | mariadb-git-7517a59a6dac4580b1f7b5cf87abf6d75b096bbc.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 95197ecfc4b..23e5049636a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1064,10 +1064,10 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) { if ((thd_info->host= thd->alloc(LIST_PROCESS_HOST_LEN+1))) my_snprintf((char *) thd_info->host, LIST_PROCESS_HOST_LEN, - "%s:%u", thd->host_or_ip, tmp->peer_port); + "%s:%u", tmp->host_or_ip, tmp->peer_port); } else - thd_info->host= thd->strdup(thd->host_or_ip); + thd_info->host= thd->strdup(tmp->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; |