← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/signal.cc

  • Committer: Monty Taylor
  • Date: 2010-11-25 17:05:36 UTC
  • mto: (1953.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: mordred@inaugust.com-20101125170536-lik3sg2qmxjgowle
Fixed formats on 32-bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/signal.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/barrier_storage.h>
 
21
#include "config.h"
 
22
#include "plugin/user_locks/module.h"
 
23
#include "plugin/user_locks/barrier_storage.h"
24
24
 
25
25
#include <string>
26
26
 
33
33
 
34
34
  if (res and res->length())
35
35
  {
36
 
    Barrier::shared_ptr barrier= Barriers::getInstance().find(Key(*getSession().user(), res->c_str()));
 
36
    Barrier::shared_ptr barrier= Barriers::getInstance().find(Key(getSession().getSecurityContext(), res->c_str()));
37
37
 
38
38
    if (barrier)
39
39
    {
43
43
      return 1;
44
44
    }
45
45
  }
46
 
  else if (not res || not res->length())
47
 
  {
48
 
    my_error(drizzled::ER_USER_LOCKS_INVALID_NAME_BARRIER, MYF(0));
49
 
    return 0;
50
 
  }
51
46
 
52
47
  my_error(drizzled::ER_USER_LOCKS_UNKNOWN_BARRIER, MYF(0));
53
48
  null_value= true;