← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/kill.cc

  • Committer: Brian Aker
  • Date: 2011-01-22 07:05:32 UTC
  • mto: This revision was merged to the branch mainline in revision 2104.
  • Revision ID: brian@tangent.org-20110122070532-r9vtkolkl7e522tm
Make session encapsulated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/kill.cc
42
42
 
43
43
bool statement::Kill::execute()
44
44
{
45
 
  Item *it= (Item *) session->lex->value_list.head();
 
45
  Item *it= (Item *) getSession()->lex->value_list.head();
46
46
 
47
 
  if ((not it->fixed && it->fix_fields(session->lex->session, &it)) || it->check_cols(1))
 
47
  if ((not it->fixed && it->fix_fields(getSession()->lex->session, &it)) || it->check_cols(1))
48
48
  {
49
49
    my_message(ER_SET_CONSTANTS_ONLY, 
50
50
               ER(ER_SET_CONSTANTS_ONLY),
52
52
    return true;
53
53
  }
54
54
 
55
 
  if (kill(static_cast<session_id_t>(it->val_int()), session->lex->type & ONLY_KILL_QUERY))
 
55
  if (kill(static_cast<session_id_t>(it->val_int()), getSession()->lex->type & ONLY_KILL_QUERY))
56
56
  {
57
 
    session->my_ok();
 
57
    getSession()->my_ok();
58
58
  }
59
59
  else
60
60
  {