diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-13 20:31:40 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-13 20:31:40 +0200 |
| commit | 3661d9882224dd485556ce937c1294eaeda02ef8 (patch) | |
| tree | 5cbba217e9fdb837aa0e3ea0357ace4a0e45e432 /sql/sql_show.cc | |
| parent | 51254da52c144781695250a98f365fbc090ef619 (diff) | |
| download | mariadb-git-3661d9882224dd485556ce937c1294eaeda02ef8.tar.gz | |
fix SHOW PROCESSLIST for --embedded
make it return the same Info values as for the standalone server.
This fixes plugins.processlist for --embedded
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d7641a6a96d..af02c74c58b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2267,16 +2267,16 @@ static const char *thread_state_info(THD *tmp) else return "Reading from net"; } - else +#else + if (tmp->get_command() == COM_SLEEP) + return ""; #endif - { - if (tmp->proc_info) - return tmp->proc_info; - else if (tmp->mysys_var && tmp->mysys_var->current_cond) - return "Waiting on cond"; - else - return NULL; - } + if (tmp->proc_info) + return tmp->proc_info; + else if (tmp->mysys_var && tmp->mysys_var->current_cond) + return "Waiting on cond"; + else + return NULL; } void mysqld_list_processes(THD *thd,const char *user, bool verbose) |