← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_index_merge_select.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_index_merge_select.cc
63
63
  return (read_keys_and_merge());
64
64
}
65
65
 
66
 
bool
67
 
optimizer::QuickIndexMergeSelect::push_quick_back(optimizer::QuickRangeSelect *quick_sel_range)
 
66
void optimizer::QuickIndexMergeSelect::push_quick_back(optimizer::QuickRangeSelect *quick_sel_range)
68
67
{
69
68
  /*
70
69
    Save quick_select that does scan on clustered primary key as it will be
79
78
  {
80
79
    quick_selects.push_back(quick_sel_range);
81
80
  }
82
 
  return false;
83
81
}
84
82
 
85
83
optimizer::QuickIndexMergeSelect::~QuickIndexMergeSelect()
86
84
{
87
 
  for (vector<optimizer::QuickRangeSelect *>::iterator it= quick_selects.begin();
88
 
       it != quick_selects.end();
89
 
       ++it)
90
 
  {
91
 
    (*it)->cursor= NULL;
92
 
  }
93
 
  for_each(quick_selects.begin(),
94
 
           quick_selects.end(),
95
 
           DeletePtr());
 
85
  BOOST_FOREACH(QuickRangeSelect* it, quick_selects)
 
86
    it->cursor= NULL;
 
87
  for_each(quick_selects.begin(), quick_selects.end(), DeletePtr());
96
88
  quick_selects.clear();
97
89
  delete pk_quick_select;
98
90
  alloc.free_root(MYF(0));
99
 
  return;
100
91
}
101
92
 
102
93