database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge of Bug#35996

Browse Source
This commit is contained in:
Martin Hansson
2009-09-30 09:31:20 +02:00
parent e6b1bade90 f4b6aeaf5b
commit 4545c5ba3c
26 changed files with 432 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@@ -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)
{