← 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-22 20:20:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1524.
  • Revision ID: jpipes@serialcoder-20100422202039-n5x48h925ixy112m
Cursor::ha_index_init() -> Cursor::startIndexScan().  Cursor::ha_index_end() -> Cursor::endIndexScan()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
3288
3288
    table->emptyRecord();
3289
3289
    if (table->group && join->tmp_table_param.sum_func_count &&
3290
3290
        table->s->keys && !table->cursor->inited)
3291
 
      table->cursor->ha_index_init(0, 0);
 
3291
      table->cursor->startIndexScan(0, 0);
3292
3292
  }
3293
3293
  /* Set up select_end */
3294
3294
  Next_select_func end_select= setup_end_select_func(join);
3766
3766
 
3767
3767
  if (!table->cursor->inited)
3768
3768
  {
3769
 
    table->cursor->ha_index_init(tab->ref.key, tab->sorted);
 
3769
    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
3770
3770
  }
3771
3771
 
3772
3772
  /* TODO: Why don't we do "Late NULLs Filtering" here? */
3814
3814
 
3815
3815
  /* Initialize the index first */
3816
3816
  if (!table->cursor->inited)
3817
 
    table->cursor->ha_index_init(tab->ref.key, tab->sorted);
 
3817
    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
3818
3818
 
3819
3819
  /* Perform "Late NULLs Filtering" (see internals manual for explanations) */
3820
3820
  for (uint32_t i= 0 ; i < tab->ref.key_parts ; i++)
3848
3848
  Table *table= tab->table;
3849
3849
 
3850
3850
  if (!table->cursor->inited)
3851
 
    table->cursor->ha_index_init(tab->ref.key, tab->sorted);
 
3851
    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
3852
3852
  if (cp_buffer_from_ref(tab->join->session, &tab->ref))
3853
3853
    return -1;
3854
3854
  if ((error=table->cursor->index_read_last_map(table->record[0],
3995
3995
  }
3996
3996
 
3997
3997
  if (!table->cursor->inited)
3998
 
    table->cursor->ha_index_init(tab->index, tab->sorted);
 
3998
    table->cursor->startIndexScan(tab->index, tab->sorted);
3999
3999
  if ((error=tab->table->cursor->index_first(tab->table->record[0])))
4000
4000
  {
4001
4001
    if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
4054
4054
  tab->read_record.index=tab->index;
4055
4055
  tab->read_record.record=table->record[0];
4056
4056
  if (!table->cursor->inited)
4057
 
    table->cursor->ha_index_init(tab->index, 1);
 
4057
    table->cursor->startIndexScan(tab->index, 1);
4058
4058
  if ((error= tab->table->cursor->index_last(tab->table->record[0])))
4059
4059
    return table->report_error(error);
4060
4060