← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/get_locks.cc

  • Committer: Lee Bieber
  • Date: 2010-12-02 18:56:33 UTC
  • mfrom: (1966.3.1 bug683842)
  • mto: This revision was merged to the branch mainline in revision 1969.
  • Revision ID: kalebral@gmail.com-20101202185633-e27o1zhpev18dlsn
Merge Monty - fix bug 683842: remove generic catch blocks       

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/get_locks.cc
36
36
 
37
37
    if (res && res->length())
38
38
    {
39
 
      list_of_locks.insert(Key(*getSession().user(), res->c_str()));
 
39
      list_of_locks.insert(Key(getSession().getSecurityContext(), res->c_str()));
40
40
    }
41
41
    else
42
42
    {
45
45
    }
46
46
  }
47
47
 
48
 
  bool result;
 
48
  boost::tribool result;
49
49
  {
50
50
    boost::this_thread::restore_interruption dl(getSession().getThreadInterupt());
51
51
 
61
61
    }
62
62
  }
63
63
 
 
64
  if (boost::indeterminate(result))
 
65
    null_value= true;
 
66
 
64
67
  if (result)
65
68
  {
66
69
    user_locks::Storable *list= static_cast<user_locks::Storable *>(getSession().getProperty("user_locks"));