← Back to branch summary

~stewart/drizzle/embedded-innodb-create-select-transaction-arrgh

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_intersect_select.cc

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_intersect_select.cc
76
76
  alloc.free_root(MYF(0));
77
77
  if (need_to_fetch_row && head->cursor->inited != Cursor::NONE)
78
78
  {
79
 
    head->cursor->ha_rnd_end();
 
79
    head->cursor->endTableScan();
80
80
  }
81
81
  return;
82
82
}
119
119
    ++it;
120
120
  }
121
121
 
122
 
  if (need_to_fetch_row && head->cursor->ha_rnd_init(1))
 
122
  if (need_to_fetch_row && head->cursor->startTableScan(1))
123
123
  {
124
124
    return 0;
125
125
  }