← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/release_wait.cc

  • Committer: Patrick Crews
  • Date: 2010-12-07 20:02:50 UTC
  • Revision ID: gleebix@gmail.com-20101207200250-6a27jgqalgw5bsb5
Added disabled.def file to disable drizzleslap due to Bug#684269.  Need to skip for tarball release this round

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());
42
41
  drizzled::session_id_t id= getSession().getSessionId();
43
42
  locks::return_t result;
44
 
 
45
43
  {
46
44
    boost::this_thread::restore_interruption dl(getSession().getThreadInterupt());
47
45
    try {
48
 
      result= user_locks::Locks::getInstance().release(Key(*user_identifier, res->c_str()), id, true);
 
46
      result= user_locks::Locks::getInstance().release(Key(getSession().getSecurityContext(), res->c_str()), id, true);
49
47
    }
50
48
    catch(boost::thread_interrupted const& error)
51
49
    {
62
60
      user_locks::Storable *list= static_cast<user_locks::Storable *>(getSession().getProperty("user_locks"));
63
61
      assert(list);
64
62
      if (list) // Just in case we ever blow the assert
65
 
        list->erase(Key(*user_identifier, res->c_str()));
 
63
        list->erase(Key(getSession().getSecurityContext(), res->c_str()));
66
64
      return 1;
67
65
    }
68
66
  case locks::NOT_FOUND: