← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/get_locks.cc

doc modifications

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/get_locks.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
#include <plugin/user_locks/module.h>
23
 
#include <plugin/user_locks/lock_storage.h>
 
21
#include "config.h"
 
22
#include "plugin/user_locks/module.h"
 
23
#include "plugin/user_locks/lock_storage.h"
24
24
 
25
25
#include <string>
26
26
 
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"));