← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sel_tree.cc

Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sel_tree.cc
191
191
      }
192
192
      optimizer::SEL_IMERGE *merge= NULL;
193
193
      /* both trees are "range" trees, produce new index merge structure */
194
 
      if (! (result= new optimizer::SEL_TREE()) || 
195
 
          ! (merge= new optimizer::SEL_IMERGE()) ||
196
 
          (result->merges.push_back(merge)) ||
197
 
          (merge->or_sel_tree(param, tree1)) ||
198
 
          (merge->or_sel_tree(param, tree2)))
 
194
                        result= new optimizer::SEL_TREE();
 
195
                        merge= new optimizer::SEL_IMERGE();
 
196
                        result->merges.push_back(merge);
 
197
      if (merge->or_sel_tree(param, tree1) || merge->or_sel_tree(param, tree2))
199
198
      {
200
199
        result= NULL;
201
200
      }