summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-19 21:43:41 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-19 21:43:41 +0200
commit0847c4f90e732378b6e4b37fe819c92bda870067 (patch)
treef73f6b61f529766ab03043b3abb2c0584e9b0643 /sql/sql_show.cc
parentcd4d7716f8b7638c11bde9861c21f5a0517ac416 (diff)
downloadmariadb-git-0847c4f90e732378b6e4b37fe819c92bda870067.tar.gz
Print right hostname or IP in SHOW PROCESSLIST
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists Docs/internals.texi: Updated description for how DATE, TIME and TIMESTAMP are stored mysql-test/r/create.result: New tests mysql-test/t/create.test: New tests sql/handler.cc: Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists. sql/sql_parse.cc: Fix that we return hostname instead of IP in SHOW PROCESSLIST sql/sql_show.cc: Print right hostname or IP in SHOW PROCESSLIST
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc4
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;