← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2009-05-15 17:06:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1023.
  • Revision ID: brian@gaz-20090515170635-croy1u63a3gqdn9n
Dead convert functions for character sets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/user.cc
53
53
 
54
54
bool Item_func_user::fix_fields(Session *session, Item **ref)
55
55
{
56
 
  return (Item_func_sysconst::fix_fields(session, ref) ||
 
56
  return (Item_str_func::fix_fields(session, ref) ||
57
57
          init(session->security_ctx.user.c_str(),
58
58
               session->security_ctx.ip.c_str()));
59
59
}
61
61
 
62
62
bool Item_func_current_user::fix_fields(Session *session, Item **ref)
63
63
{
64
 
  if (Item_func_sysconst::fix_fields(session, ref))
 
64
  if (Item_str_func::fix_fields(session, ref))
65
65
    return true;
66
66
 
67
67
  Security_context *ctx= &session->security_ctx;