← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_index_merge_select.cc

  • Committer: Brian Aker
  • Date: 2010-11-08 20:00:45 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108200045-wgysfvli5mtduszd
Enapsulate Kill.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_index_merge_select.cc
156
156
      break;
157
157
    }
158
158
 
159
 
    if (session->killed)
 
159
    if (session->getKilled())
160
160
      return 0;
161
161
 
162
162
    /* skip row if it will be retrieved by clustered PK scan */