← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: tdavies
  • Date: 2010-10-10 05:31:41 UTC
  • mto: (1827.1.3 trunk-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1829.
  • Revision ID: tdavies@molly-20101010053141-7rbcb8fe8a6xxrn8
Bug:621861 Changed C structs to C++ class in the following files: filesort.cc, filesort_info.h, sql_sort.h, table.h. removed the '_st' from the name of some of the classes. For more detail of changes made read the merge proposal notes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
397
397
    delete cond;
398
398
    cond= 0;
399
399
  }
400
 
  file->close_cached_file();
 
400
  close_cached_file(file);
401
401
}
402
402
 
403
403
 
464
464
    MAX_KEY if no such index was found.
465
465
*/
466
466
 
467
 
uint32_t optimizer::get_index_for_order(Table *table, Order *order, ha_rows limit)
 
467
uint32_t optimizer::get_index_for_order(Table *table, order_st *order, ha_rows limit)
468
468
{
469
469
  uint32_t idx;
470
470
  uint32_t match_key= MAX_KEY, match_key_len= MAX_KEY_LENGTH + 1;
471
 
  Order *ord;
 
471
  order_st *ord;
472
472
 
473
473
  for (ord= order; ord; ord= ord->next)
474
474
    if (!ord->asc)
4578
4578
  uint32_t key_infix_len= 0;          /* Length of key_infix. */
4579
4579
  optimizer::GroupMinMaxReadPlan *read_plan= NULL; /* The eventually constructed TRP. */
4580
4580
  uint32_t key_part_nr;
4581
 
  Order *tmp_group= NULL;
 
4581
  order_st *tmp_group= NULL;
4582
4582
  Item *item= NULL;
4583
4583
  Item_field *item_field= NULL;
4584
4584