← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/data_engine/processlist.cc

Update for test split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/data_engine/processlist.cc
77
77
 
78
78
 
79
79
  /* USER */
80
 
  val= tmp_sctx->user.c_str() ? tmp_sctx->user.c_str() : "unauthenticated user";
81
 
  push(val);
 
80
  if (tmp_sctx->user.length())
 
81
    push(tmp_sctx->user);
 
82
  else 
 
83
    push("unauthenticated user");
82
84
 
83
85
  /* HOST */
84
 
  push(tmp_sctx->ip.c_str());
 
86
  push(tmp_sctx->ip);
85
87
 
86
88
  /* DB */
87
89
  if (! tmp->db.empty())
88
90
  {
89
 
    push(tmp->db.c_str());
 
91
    push(tmp->db);
90
92
  }
91
93
  else
92
94
  {
93
 
    push("<none selected>");
 
95
    push();
94
96
  }
95
97
 
96
98
  /* COMMAND */
116
118
                tmp->mysys_var &&
117
119
                tmp->mysys_var->current_cond ?
118
120
                "Waiting on cond" : NULL);
119
 
  push(val ? val : "unknown");
 
121
  val ? push(val) : push();
120
122
 
121
123
  /* INFO */
122
124
  size_t length= strlen(tmp->process_list_info);
123
 
  if (length)
124
 
  {
125
 
    push(tmp->process_list_info, length);
126
 
  }
127
 
  else
128
 
  {
129
 
    push("");
130
 
  }
 
125
  length ?  push(tmp->process_list_info, length) : push();
131
126
 
132
127
  it++;
133
128