← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Jay Pipes
  • Date: 2010-04-23 17:43:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1524.
  • Revision ID: jpipes@serialcoder-20100423174311-ze5sq5nrbb7km2po
ha_rnd_init -> startTableScan, rnd_init -> doStartTableScan, ha_rnd_end -> endTableScan, rnd_end -> doEndTableScan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
3946
3946
int init_read_record_seq(JoinTable *tab)
3947
3947
{
3948
3948
  tab->read_record.read_record= rr_sequential;
3949
 
  if (tab->read_record.cursor->ha_rnd_init(1))
 
3949
  if (tab->read_record.cursor->startTableScan(1))
3950
3950
    return 1;
3951
3951
  return (*tab->read_record.read_record)(&tab->read_record);
3952
3952
}
5327
5327
  org_record=(char*) (record=table->record[0])+offset;
5328
5328
  new_record=(char*) table->record[1]+offset;
5329
5329
 
5330
 
  cursor->ha_rnd_init(1);
 
5330
  cursor->startTableScan(1);
5331
5331
  error=cursor->rnd_next(record);
5332
5332
  for (;;)
5333
5333
  {
5448
5448
    return(1);
5449
5449
  }
5450
5450
 
5451
 
  cursor->ha_rnd_init(1);
 
5451
  cursor->startTableScan(1);
5452
5452
  key_pos= &key_buffer[0];
5453
5453
  for (;;)
5454
5454
  {
5496
5496
  free((char*) field_lengths);
5497
5497
  hash_free(&hash);
5498
5498
  cursor->extra(HA_EXTRA_NO_CACHE);
5499
 
  (void) cursor->ha_rnd_end();
 
5499
  (void) cursor->endTableScan();
5500
5500
  return(0);
5501
5501
 
5502
5502
err:
5503
5503
  free((char*) field_lengths);
5504
5504
  hash_free(&hash);
5505
5505
  cursor->extra(HA_EXTRA_NO_CACHE);
5506
 
  (void) cursor->ha_rnd_end();
 
5506
  (void) cursor->endTableScan();
5507
5507
  if (error)
5508
5508
    table->print_error(error,MYF(0));
5509
5509
  return(1);