← 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: 2009-05-06 06:59:53 UTC
  • mfrom: (1003.1.20 merge)
  • Revision ID: brian@gaz-20090506065953-4mrfmaty42e0ixpq
Merge handler cleanup (and ALTER TABLE cleanup) We go from 1 and 2 half
thought out systems... to just 1.

This should all be changed when we finish the StorageEngine rewrite

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
1455
1455
  uint32_t length= 0;
1456
1456
  uint32_t fields= 0;
1457
1457
  uint32_t null_fields= 0;
1458
 
  bitset<MAX_FIELDS> *read_set= (*ptabfield)->table->read_set;
1459
1458
 
1460
1459
  /*
1461
1460
    If there is a reference to a field in the query add it
1470
1469
 
1471
1470
  for (pfield= ptabfield; (field= *pfield) ; pfield++)
1472
1471
  {
1473
 
    if (!read_set->test(field->field_index))
 
1472
    if (!(field->isReadSet()))
1474
1473
      continue;
1475
1474
    if (field->flags & BLOB_FLAG)
1476
1475
      return 0;
1493
1492
  null_fields= 0;
1494
1493
  for (pfield= ptabfield; (field= *pfield) ; pfield++)
1495
1494
  {
1496
 
    if (!read_set->test(field->field_index))
 
1495
    if (!(field->isReadSet()))
1497
1496
      continue;
1498
1497
    addonf->field= field;
1499
1498
    addonf->offset= length;