diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-03-01 13:21:48 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-03-01 13:21:48 +0300 |
| commit | cb147b39654d3afea938253ed1457c088a5e87c9 (patch) | |
| tree | 854ca74d9bf60c0a120feacde8e3b6951f46bf61 /sql/sql_show.cc | |
| parent | b8f00542e2ed66803d747cc5151279b9edf1392a (diff) | |
| parent | c6ba9598026b06f5d64e7508abb652ac22d50e48 (diff) | |
| download | mariadb-git-cb147b39654d3afea938253ed1457c088a5e87c9.tar.gz | |
Merge 5.3 -> 5.3-subqueries-mwl90
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 5732385950a..3f20e8afa36 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1942,8 +1942,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) pthread_mutex_lock(&mysys_var->mutex); thd_info->proc_info= (char*) (tmp->killed == THD::KILL_CONNECTION? "Killed" : 0); #ifndef EMBEDDED_LIBRARY - thd_info->state_info= (char*) (tmp->locked ? "Locked" : - tmp->net.reading_or_writing ? + thd_info->state_info= (char*) (tmp->net.reading_or_writing ? (tmp->net.reading_or_writing == 2 ? "Writing to net" : thd_info->command == COM_SLEEP ? "" : @@ -2068,8 +2067,7 @@ int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond) table->field[5]->store(utime / 1000000, TRUE); /* STATE */ #ifndef EMBEDDED_LIBRARY - val= (char*) (tmp->locked ? "Locked" : - tmp->net.reading_or_writing ? + val= (char*) (tmp->net.reading_or_writing ? (tmp->net.reading_or_writing == 2 ? "Writing to net" : tmp->command == COM_SLEEP ? "" : |