← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2010-12-18 05:18:30 UTC
  • mto: This revision was merged to the branch mainline in revision 2009.
  • Revision ID: brian@tangent.org-20101218051830-lswb13hfiqbia74o
Adding user identifier that makes use of a shared ptr to handle concurrency
issues around looking at the state of a connection.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1177
1177
           use the default max length */
1178
1178
{
1179
1179
  Session *session= reinterpret_cast<Session *>(in_session);
 
1180
  drizzled::identifier::User::const_shared_ptr user_identifier(session->user());
 
1181
 
1180
1182
  fprintf(f,
1181
1183
          "Drizzle thread %"PRIu64", query id %"PRIu64", %s, %s, %s ",
1182
1184
          static_cast<uint64_t>(session->getSessionId()),
1183
1185
          static_cast<uint64_t>(session->getQueryId()),
1184
1186
          glob_hostname,
1185
 
          session->getSecurityContext().getIp().c_str(),
1186
 
          session->getSecurityContext().getUser().c_str()
 
1187
          user_identifier->address().c_str(),
 
1188
          user_identifier->username().c_str()
1187
1189
  );
1188
1190
  fprintf(f, "\n%s", session->getQueryString()->c_str());
1189
1191
  putc('\n', f);