~stewart/drizzle/embedded-innodb-autoincrement

« back to all changes in this revision

Viewing changes to drizzled/records.cc

  • Committer: Stewart Smith
  • Date: 2010-05-12 12:04:58 UTC
  • mfrom: (1283.120.50 staging)
  • mto: This revision was merged to the branch mainline in revision 1430.
  • Revision ID: stewart@flamingspork.com-20100512120458-grl8fnvsw00z2l1o
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
 
59
59
  table->status=0;                      /* And it's always found */
60
60
  if (!table->cursor->inited)
61
 
    table->cursor->ha_index_init(idx, 1);
 
61
    table->cursor->startIndexScan(idx, 1);
62
62
  /* read_record will be changed to rr_index in rr_index_first */
63
63
  info->read_record= rr_index_first;
64
64
}
107
107
    reinit_io_cache(info->io_cache,internal::READ_CACHE,0L,0,0);
108
108
    info->ref_pos=table->cursor->ref;
109
109
    if (!table->cursor->inited)
110
 
      table->cursor->ha_rnd_init(0);
 
110
      table->cursor->startTableScan(0);
111
111
 
112
112
    /*
113
113
      table->sort.addon_field is checked because if we use addon fields,
139
139
  }
140
140
  else if (table->sort.record_pointers)
141
141
  {
142
 
    table->cursor->ha_rnd_init(0);
 
142
    table->cursor->startTableScan(0);
143
143
    info->cache_pos=table->sort.record_pointers;
144
144
    info->cache_end=info->cache_pos+
145
145
                    table->sort.found_records*info->ref_length;
149
149
  else
150
150
  {
151
151
    info->read_record= rr_sequential;
152
 
    table->cursor->ha_rnd_init(1);
 
152
    table->cursor->startTableScan(1);
153
153
    /* We can use record cache if we don't update dynamic length tables */
154
154
    if (!table->no_cache &&
155
155
        (use_record_cache > 0 ||