← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Lee Bieber
  • Date: 2011-01-06 23:26:20 UTC
  • mfrom: (2060.1.2 build)
  • Revision ID: kalebral@gmail.com-20110106232620-cxrk2ra994z8fl2w
Merge Andrew - fix bug 697726: crash in drizzled::JoinTable::readCachedRecord

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
1834
1834
    for (sl= tmp_unit->first_select(); sl; sl= sl->next_select())
1835
1835
    {
1836
1836
      Item_subselect *subselect= sl->master_unit()->item;
1837
 
      bool full_local= full && (!subselect || subselect->is_evaluated());
 
1837
      bool full_local= full && (!subselect || 
 
1838
                                (subselect->is_evaluated() &&
 
1839
                                !subselect->is_uncacheable()));
1838
1840
      /*
1839
1841
        If this join is evaluated, we can fully clean it up and clean up all
1840
1842
        its underlying joins even if they are correlated -- they will not be