← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/create_barrier.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/create_barrier.cc
38
38
  }
39
39
  null_value= false;
40
40
 
41
 
  drizzled::identifier::User::const_shared_ptr user_identifier(getSession().user());
 
41
  drizzled::identifier::user::ptr user_identifier(getSession().user());
42
42
  bool result= arg_count == 2
43
43
    ? Barriers::getInstance().create(Key(*user_identifier, res->c_str()), getSession().getSessionId(), args[1]->val_int())
44
44
    : Barriers::getInstance().create(Key(*user_identifier, res->c_str()), getSession().getSessionId());