← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/session_dictionary/processlist.cc

  • Committer: Brian Aker
  • Date: 2010-12-18 10:14:05 UTC
  • mfrom: (2008.1.3 clean)
  • Revision ID: brian@tangent.org-20101218101405-qjbse29shi9coklg
Merge of user identifier work

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/session_dictionary/processlist.cc
66
66
  while ((tmp= session_generator))
67
67
  {
68
68
    drizzled::Session::State::const_shared_ptr state(tmp->state());
69
 
    const SecurityContext *tmp_sctx= &tmp->getSecurityContext();
 
69
    identifier::User::const_shared_ptr tmp_sctx= tmp->user();
70
70
 
71
71
    /* ID */
72
72
    push((int64_t) tmp->thread_id);
73
73
 
74
74
    /* USER */
75
 
    if (not tmp_sctx->getUser().empty())
76
 
      push(tmp_sctx->getUser());
 
75
    if (not tmp_sctx->username().empty())
 
76
      push(tmp_sctx->username());
77
77
    else 
78
78
      push(_("no user"));
79
79
 
80
80
    /* HOST */
81
 
    push(tmp_sctx->getIp());
 
81
    push(tmp_sctx->address());
82
82
 
83
83
    /* DB */
84
84
    drizzled::util::string::const_shared_ptr schema(tmp->schema());