← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_union_select.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:19:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622141944-na0vb0uv30n6u55z
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_union_select.cc
69
69
 
70
70
int optimizer::QuickRorUnionSelect::init()
71
71
{
72
 
  queue=
73
 
    new priority_queue<optimizer::QuickSelectInterface *,
74
 
                       vector<optimizer::QuickSelectInterface *>,
75
 
                       optimizer::compare_functor >(optimizer::compare_functor(this));
76
 
  if (! (cur_rowid= (unsigned char*) alloc.alloc_root(2 * head->cursor->ref_length)))
77
 
  {
78
 
    return 0;
79
 
  }
 
72
  queue= new priority_queue<QuickSelectInterface*, vector<QuickSelectInterface*>,  compare_functor>(compare_functor(this));
 
73
  cur_rowid= (unsigned char*) alloc.alloc(2 * head->cursor->ref_length);
80
74
  prev_rowid= cur_rowid + head->cursor->ref_length;
81
 
  return 0;
 
75
  return 0; // return void
82
76
}
83
77
 
84
78
 
85
79
int optimizer::QuickRorUnionSelect::reset()
86
80
{
87
 
  int error;
88
81
  have_prev_rowid= false;
89
82
  if (! scans_inited)
90
83
  {
116
109
      return 0;
117
110
    }
118
111
    
119
 
    error= (*it)->get_next();
 
112
    int error= (*it)->get_next();
120
113
    if (error)
121
114
    {
122
115
      if (error == HA_ERR_END_OF_FILE)