← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/wait.cc

  • Committer: Brian Aker
  • Date: 2010-11-17 23:04:33 UTC
  • mto: (1939.1.1 quick)
  • mto: This revision was merged to the branch mainline in revision 1940.
  • Revision ID: brian@tangent.org-20101117230433-owdh977ycs2ak31b
Fix errror messages and namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/wait.cc
41
41
  if (not res->length())
42
42
    return 0;
43
43
 
44
 
  client::Wakeup::shared_ptr barrier= Barriers::getInstance().find(Key(getSession().getSecurityContext(), res->c_str()));
 
44
  Barrier::shared_ptr barrier= Barriers::getInstance().find(Key(getSession().getSecurityContext(), res->c_str()));
45
45
 
46
46
  if (barrier)
47
47
  {
48
 
    std::cerr << "Going into wait() \n";
 
48
    if (barrier->getOwner() == getSession().getSessionId())
 
49
    {
 
50
      my_error(drizzled::ER_USER_LOCKS_CANT_WAIT_ON_OWN_BARRIER, MYF(0));
 
51
      null_value= true;
 
52
 
 
53
      return 0;
 
54
    }
 
55
 
49
56
    barrier->wait();
50
57
 
51
 
    return 0;
 
58
    return 1;
52
59
  }
53
60
 
 
61
  my_error(drizzled::ER_USER_LOCKS_UNKNOWN_BARRIER, MYF(0));
54
62
  null_value= true;
55
63
 
56
64
  return 0;