← Back to branch summary

~stewart/drizzle/embedded-innodb-autoincrement

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_union_select.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_union_select.cc
127
127
    queue->push(*it);
128
128
  }
129
129
 
130
 
  if (head->cursor->ha_rnd_init(1))
 
130
  if (head->cursor->startTableScan(1))
131
131
  {
132
132
    return 0;
133
133
  }
157
157
  quick_selects.clear();
158
158
  if (head->cursor->inited != Cursor::NONE)
159
159
  {
160
 
    head->cursor->ha_rnd_end();
 
160
    head->cursor->endTableScan();
161
161
  }
162
162
  alloc.free_root(MYF(0));
163
163
}