diff options
| author | Martin Hansson <martin.hansson@sun.com> | 2009-09-30 09:31:20 +0200 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@sun.com> | 2009-09-30 09:31:20 +0200 |
| commit | f0deca7377c4eccc8320920d403f9ae15e49a885 (patch) | |
| tree | 361c75b693a61a1a2cd7577cf124df06deadbd6b /sql/sql_show.cc | |
| parent | 4a56df938c2ac40388d04273994a06b21b95f8d4 (diff) | |
| parent | 508527a94c551e1cb0e69906544e99077c2d468a (diff) | |
| download | mariadb-git-f0deca7377c4eccc8320920d403f9ae15e49a885.tar.gz | |
Merge of Bug#35996
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a065d953b67..75c9ea6c524 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1980,7 +1980,7 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) tmp->mysys_var->current_cond ? "Waiting on cond" : NullS); #else - val= (char *) "Writing to net"; + val= (char *) (tmp->proc_info ? tmp->proc_info : NullS); #endif if (val) { |