summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-12-05 13:03:00 +0200
committermonty@hundin.mysql.fi <>2001-12-05 13:03:00 +0200
commit1de4fff5ba80982cbed3a524488528c83ed8f945 (patch)
tree739c2cfffa69408c6460ba4c419a59d5b594cbb1 /sql/sql_show.cc
parent1d26537da53fee228b2f9d974d4806a06b76e33e (diff)
downloadmariadb-git-1de4fff5ba80982cbed3a524488528c83ed8f945.tar.gz
Update of query cache code.
Changed some sql_alloc() -> thd->alloc() Removed a lot of compiler warnings on Linux Alpha (64 bit) Fixed some core dumps on 64 bit systems (wrong type for packet_len)
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 19c3d89caaf..16790ac1621 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1054,9 +1054,8 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
thd_info->query=0;
if (tmp->query)
{
- uint length=(uint) strlen(tmp->query);
- if (length > max_query_length)
- length=max_query_length;
+ /* query_length is always set before tmp->query */
+ uint length= min(max_query_length, tmp->query_length);
thd_info->query=(char*) thd->memdup(tmp->query,length+1);
thd_info->query[length]=0;
}