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 | |
| 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
| -rw-r--r-- | sql/sql_class.h | 2 | ||||
| -rw-r--r-- | sql/sql_show.cc | 7 | ||||
| -rw-r--r-- | vio/viosocket.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index da341c64d50..a8eaf1b200d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -352,7 +352,7 @@ public: */ char *host,*user,*priv_user,*db,*ip; /* remote (peer) port */ - u_int16_t peer_port; + uint16 peer_port; /* Points to info-string that will show in SHOW PROCESSLIST */ const char *proc_info; /* points to host if host is available, otherwise points to ip */ 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; diff --git a/vio/viosocket.c b/vio/viosocket.c index edcea19d76a..898b9a96c11 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -277,7 +277,7 @@ my_socket vio_fd(Vio* vio) } -my_bool vio_peer_addr(Vio * vio, char *buf, u_int16_t *port) +my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port) { DBUG_ENTER("vio_peer_addr"); DBUG_PRINT("enter", ("sd: %d", vio->sd)); |