← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
1221
1221
*/
1222
1222
void JoinTable::cleanup()
1223
1223
{
1224
 
  delete select;
1225
 
  select= 0;
1226
 
  delete quick;
1227
 
  quick= 0;
 
1224
  safe_delete(select);
 
1225
  safe_delete(quick);
 
1226
 
1228
1227
  if (cache.buff)
1229
1228
  {
1230
1229
    size_t size= cache.end - cache.buff;
3641
3640
 
3642
3641
int test_if_quick_select(JoinTable *tab)
3643
3642
{
3644
 
  delete tab->select->quick;
3645
 
  tab->select->quick= 0;
 
3643
  safe_delete(tab->select->quick);
 
3644
 
3646
3645
  return tab->select->test_quick_select(tab->join->session, tab->keys,
3647
3646
                                        (table_map) 0, HA_POS_ERROR, 0, false);
3648
3647
}
4801
4800
          tab->type= AM_NEXT;           // Read with index_first(), index_next()
4802
4801
          if (select && select->quick)
4803
4802
          {
4804
 
            delete select->quick;
4805
 
            select->quick= 0;
 
4803
            safe_delete(select->quick);
4806
4804
          }
4807
4805
          if (table->covering_keys.test(best_key))
4808
4806
          {
4875
4873
          tab->limit= 0;
4876
4874
          return 0; // Reverse sort not supported
4877
4875
        }
4878
 
        select->quick=tmp;
 
4876
        select->quick= tmp;
4879
4877
      }
4880
4878
    }
4881
4879
    else if (tab->type != AM_NEXT &&