← Back to branch summary

~ubuntu-branches/ubuntu/saucy/drizzle/saucy-proposed

« back to all changes in this revision

Viewing changes to plugin/user_locks/release_wait.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20120619104649-e2l0ggd4oz3um0f4
Tags: upstream-7.1.36-stable
Import upstream version 7.1.36-stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/release_wait.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
  drizzled::session_id_t id= getSession().getSessionId();
43
43
  locks::return_t result;
44
44
 
59
59
  default:
60
60
  case locks::SUCCESS:
61
61
    {
62
 
      user_locks::Storable *list= static_cast<user_locks::Storable *>(getSession().getProperty("user_locks"));
 
62
      user_locks::Storable *list= getSession().getProperty<user_locks::Storable>("user_locks");
63
63
      assert(list);
64
64
      if (list) // Just in case we ever blow the assert
65
65
        list->erase(Key(*user_identifier, res->c_str()));