← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Jay Pipes
  • Date: 2008-08-25 21:12:17 UTC
  • mfrom: (322.2.4 stdize-code)
  • Revision ID: jay@mysql.com-20080825211217-eqvfmcgvkoktdvtr
From Mats.  Corrected build issue with missing Makefile target

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
4911
4911
    {
4912
4912
      /* one tree is index merge tree and another is range tree */
4913
4913
      if (tree1->merges.is_empty())
4914
 
        swap_variables(SEL_TREE*, tree1, tree2);
 
4914
        std::swap(tree1, tree2);
4915
4915
      
4916
4916
      if (param->remove_jump_scans && remove_nonrange_trees(param, tree2))
4917
4917
         return(new SEL_TREE(SEL_TREE::ALWAYS));
4997
4997
  {
4998
4998
    if (key1->part > key2->part)
4999
4999
    {
5000
 
      swap_variables(SEL_ARG *, key1, key2);
 
5000
      std::swap(key1, key2);
5001
5001
      clone_flag=swap_clone_flag(clone_flag);
5002
5002
    }
5003
5003
    // key1->part < key2->part
5013
5013
       key2->type != SEL_ARG::MAYBE_KEY) ||
5014
5014
      key1->type == SEL_ARG::MAYBE_KEY)
5015
5015
  {                                             // Put simple key in key2
5016
 
    swap_variables(SEL_ARG *, key1, key2);
 
5016
    std::swap(key1, key2);
5017
5017
    clone_flag=swap_clone_flag(clone_flag);
5018
5018
  }
5019
5019
 
5156
5156
  {
5157
5157
    if (key2->use_count == 0 || key1->elements > key2->elements)
5158
5158
    {
5159
 
      swap_variables(SEL_ARG *,key1,key2);
 
5159
      std::swap(key1,key2);
5160
5160
    }
5161
5161
    if (key1->use_count > 0 || !(key1=key1->clone_tree(param)))
5162
5162
      return 0;                                 // OOM