diff options
| author | Nisha <nisha.gopalakrishnan@oracle.com> | 2015-04-06 14:30:27 +0530 |
|---|---|---|
| committer | Nisha <nisha.gopalakrishnan@oracle.com> | 2015-04-06 14:30:27 +0530 |
| commit | 9bacdef10bbb7b74090059987b87c0564efe3c3f (patch) | |
| tree | 83edf6f297b0587fbf3236a565288a3a37860575 /sql | |
| parent | 232d8bbdb165260ba8eca51565067a93659bea6f (diff) | |
| parent | e65f3f6f2e35d92fd1395f7c5b02184c739c5fc7 (diff) | |
| download | mariadb-git-9bacdef10bbb7b74090059987b87c0564efe3c3f.tar.gz | |
Merge branch 'mysql-5.1' into mysql-5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 24e7d92d1ad..51f5d75e49b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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); |