← 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

merge innobase 1.0.9 build fixes

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 */