← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/kill.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/kill.cc
60
60
 
61
61
bool statement::Kill::execute()
62
62
{
63
 
  Item *it= (Item *) getSession()->lex->value_list.head();
 
63
  Item *it= (Item *) getSession()->getLex()->value_list.head();
64
64
 
65
 
  if ((not it->fixed && it->fix_fields(getSession()->lex->session, &it)) || it->check_cols(1))
 
65
  if ((not it->fixed && it->fix_fields(getSession()->getLex()->session, &it)) || it->check_cols(1))
66
66
  {
67
67
    my_message(ER_SET_CONSTANTS_ONLY, 
68
68
               ER(ER_SET_CONSTANTS_ONLY),
70
70
    return true;
71
71
  }
72
72
 
73
 
  if (kill(static_cast<session_id_t>(it->val_int()), getSession()->lex->type & ONLY_KILL_QUERY))
 
73
  if (kill(static_cast<session_id_t>(it->val_int()), getSession()->getLex()->type & ONLY_KILL_QUERY))
74
74
  {
75
75
    getSession()->my_ok();
76
76
  }