← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/processlist.cc

Merge in security refactor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/processlist.cc
190
190
    for (vector<Session*>::iterator it= getSessionList().begin(); it != getSessionList().end(); ++it)
191
191
    {
192
192
      tmp= *it;
193
 
      Security_context *tmp_sctx= &tmp->security_ctx;
 
193
      const SecurityContext *tmp_sctx= &tmp->getSecurityContext();
194
194
      internal::st_my_thread_var *mysys_var;
195
195
      const char *val;
196
196
 
209
209
      /* ID */
210
210
      table->field[0]->store((int64_t) tmp->thread_id, true);
211
211
      /* USER */
212
 
      val= tmp_sctx->user.c_str() ? tmp_sctx->user.c_str() : "unauthenticated user";
 
212
      val= tmp_sctx->getUser().c_str() ? tmp_sctx->getUser().c_str() : "unauthenticated user";
213
213
      table->field[1]->store(val, strlen(val), cs);
214
214
      /* HOST */
215
 
      table->field[2]->store(tmp_sctx->ip.c_str(), strlen(tmp_sctx->ip.c_str()), cs);
 
215
      table->field[2]->store(tmp_sctx->getIp().c_str(), strlen(tmp_sctx->getIp().c_str()), cs);
216
216
      /* DB */
217
217
      if (! tmp->db.empty())
218
218
      {