mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mysql-5.1' into mysql-5.5

Browse source
This commit is contained in:
Nisha 2015-04-06 14:30:27 +05:30
commit 9bacdef10b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_show.cc
View file

@ -1839,7 +1839,8 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
Security_context *tmp_sctx= tmp->security_ctx;
struct st_my_thread_var *mysys_var;
if ((tmp->vio_ok() || tmp->system_thread) &&
(!user || (tmp_sctx->user && !strcmp(tmp_sctx->user, user))))
(!user || (!tmp->system_thread && tmp_sctx->user &&
!strcmp(tmp_sctx->user, user))))
{
thread_info *thd_info= new thread_info;
@ -1949,7 +1950,8 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond)
const char *val, *db;
if ((!tmp->vio_ok() && !tmp->system_thread) ||
(user && (!tmp_sctx->user || strcmp(tmp_sctx->user, user))))
(user && (tmp->system_thread || !tmp_sctx->user ||
strcmp(tmp_sctx->user, user))))
continue;
restore_record(table, s->default_values);