← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 20:10:51 UTC
  • mfrom: (1910.2.8 merge)
  • Revision ID: brian@tangent.org-20101108201051-fmplr6oke3c088kf
Encapsulation around locking/kill

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
3147
3147
      rc= sub_select(join,join_tab,end_of_records);
3148
3148
    return rc;
3149
3149
  }
3150
 
  if (join->session->killed)            // If aborted by user
 
3150
  if (join->session->getKilled())               // If aborted by user
3151
3151
  {
3152
3152
    join->session->send_kill_message();
3153
3153
    return NESTED_LOOP_KILLED;
3958
3958
  Table *table=join->tmp_table;
3959
3959
  int     idx= -1;
3960
3960
 
3961
 
  if (join->session->killed)
 
3961
  if (join->session->getKilled())
3962
3962
  {                                             // Aborted by user
3963
3963
    join->session->send_kill_message();
3964
3964
    return NESTED_LOOP_KILLED;
5099
5099
  error=cursor->rnd_next(record);
5100
5100
  for (;;)
5101
5101
  {
5102
 
    if (session->killed)
 
5102
    if (session->getKilled())
5103
5103
    {
5104
5104
      session->send_kill_message();
5105
5105
      error=0;
5217
5217
  for (;;)
5218
5218
  {
5219
5219
    unsigned char *org_key_pos;
5220
 
    if (session->killed)
 
5220
    if (session->getKilled())
5221
5221
    {
5222
5222
      session->send_kill_message();
5223
5223
      error=0;