← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
1029
1029
    if ((field= sort_field->field))
1030
1030
    {
1031
1031
      if (field->getTable() == table)
1032
 
        table->setReadSet(field->field_index);
 
1032
        table->setReadSet(field->position());
1033
1033
    }
1034
1034
    else
1035
1035
    {                                           // Item
1043
1043
    sort_addon_field *addonf= addon_field;
1044
1044
    Field *field;
1045
1045
    for ( ; (field= addonf->field) ; addonf++)
1046
 
      table->setReadSet(field->field_index);
 
1046
      table->setReadSet(field->position());
1047
1047
  }
1048
1048
  else
1049
1049
  {