← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/user_locks_dictionary.cc

  • Committer: Lee Bieber
  • Date: 2011-01-08 03:39:25 UTC
  • mfrom: (2062.1.2 build)
  • Revision ID: kalebral@gmail.com-20110108033925-koobar399kwrm4ba
Merge Brian - parser clean up
Merge Marisa - latest doc updates, fix sphinx warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/user_locks_dictionary.cc
33
33
{
34
34
  add_field("USER_LOCK_NAME", plugin::TableFunction::STRING, user_locks::LARGEST_LOCK_NAME, false);
35
35
  add_field("SESSION_ID", plugin::TableFunction::NUMBER, 0, false);
36
 
  add_field("USER_NAME", plugin::TableFunction::STRING);
 
36
  add_field("USERNAME", plugin::TableFunction::STRING);
37
37
}
38
38
 
39
39
user_locks::UserLocks::Generator::Generator(drizzled::Field **arg) :
54
54
    // SESSION_ID
55
55
    push((*iter).second->id);
56
56
    //
57
 
    // USER_NAME
 
57
    // USERNAME
58
58
    push((*iter).first.getUser());
59
59
 
60
60
    iter++;