← 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: 2010-10-19 08:17:10 UTC
  • mto: (1864.2.1 merge)
  • mto: This revision was merged to the branch mainline in revision 1864.
  • Revision ID: brian@tangent.org-20101019081710-hw13j03145h13pdg
Merge in a bit more strictness around table type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/kill.cc
21
21
#include "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
 
#include <drizzled/session/cache.h>
25
24
#include <drizzled/statement/kill.h>
26
25
 
27
26
namespace drizzled
28
27
{
29
28
 
30
 
static bool kill_one_thread(session_id_t id, bool only_kill_query)
31
 
{
32
 
  drizzled::Session::shared_ptr session= session::Cache::singleton().find(id);
33
 
 
34
 
  if (session and session->isViewable())
35
 
  {
36
 
    session->awake(only_kill_query ? Session::KILL_QUERY : Session::KILL_CONNECTION);
37
 
    return true;
38
 
  }
39
 
 
40
 
  return false;
41
 
}
42
 
 
43
29
bool statement::Kill::execute()
44
30
{
45
31
  Item *it= (Item *) session->lex->value_list.head();
46
32
 
47
 
  if ((not it->fixed && it->fix_fields(session->lex->session, &it)) || it->check_cols(1))
 
33
  if ((! it->fixed && it->fix_fields(session->lex->session, &it)) || 
 
34
      it->check_cols(1))
48
35
  {
49
36
    my_message(ER_SET_CONSTANTS_ONLY, 
50
37
               ER(ER_SET_CONSTANTS_ONLY),
51
38
               MYF(0));
52
39
    return true;
53
40
  }
54
 
 
55
 
  if (kill_one_thread(static_cast<session_id_t>(it->val_int()), session->lex->type & ONLY_KILL_QUERY))
56
 
  {
57
 
    session->my_ok();
58
 
  }
59
 
  else
60
 
  {
61
 
    my_error(ER_NO_SUCH_THREAD, MYF(0), it->val_int());
62
 
  }
63
 
 
 
41
  sql_kill(session, (ulong) it->val_int(), session->lex->type & ONLY_KILL_QUERY);
64
42
  return false;
65
43
}
66
44