← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/user.cc

  • Committer: Dennis Schoen
  • Date: 2010-01-28 16:47:02 UTC
  • mto: This revision was merged to the branch mainline in revision 1292.
  • Revision ID: dennis@blogma.de-20100128164702-0gyrsy2ymctj9ia4
add getSecurityContext()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/user.cc
54
54
bool Item_func_user::fix_fields(Session *session, Item **ref)
55
55
{
56
56
  return (Item_str_func::fix_fields(session, ref) ||
57
 
          init(session->security_ctx.getUser().c_str(),
58
 
               session->security_ctx.getIp().c_str()));
 
57
          init(session->getSecurityContext().getUser().c_str(),
 
58
               session->getSecurityContext().getIp().c_str()));
59
59
}
60
60
 
61
61
 
64
64
  if (Item_str_func::fix_fields(session, ref))
65
65
    return true;
66
66
 
67
 
  SecurityContext *ctx= &session->security_ctx;
 
67
  SecurityContext *ctx= &session->getSecurityContext();
68
68
  return init(ctx->getUser().c_str(), ctx->getIp().c_str());
69
69
}
70
70