← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/explain_plan.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/explain_plan.cc
351
351
      }
352
352
      else
353
353
      {
354
 
        uint32_t keyno= MAX_KEY;
355
 
        if (tab->ref.key_parts)
356
 
          keyno= tab->ref.key;
357
 
        else if (tab->select && tab->select->quick)
358
 
          keyno = tab->select->quick->index;
359
 
 
360
354
        if (quick_type == optimizer::QuickSelectInterface::QS_TYPE_ROR_UNION ||
361
355
            quick_type == optimizer::QuickSelectInterface::QS_TYPE_ROR_INTERSECT ||
362
356
            quick_type == optimizer::QuickSelectInterface::QS_TYPE_INDEX_MERGE)