← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Monty Taylor
  • Date: 2008-10-16 20:02:16 UTC
  • mfrom: (511.1.9 codestyle)
  • Revision ID: monty@inaugust.com-20081016200216-dvp7f7xx6k5wppkl
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
106
106
#include <drizzled/server_includes.h>
107
107
#include <drizzled/sql_select.h>
108
108
 
109
 
#ifndef EXTRA_DEBUG
110
 
#define test_rb_tree(A,B) {}
111
 
#define test_use_count(A) {}
112
 
#endif
113
 
 
114
109
/*
115
110
  Convert double value to #rows. Currently this does floor(), and we
116
111
  might consider using round() instead.
5537
5532
    return(0);                          // Maybe root later
5538
5533
  if (remove_color == BLACK)
5539
5534
    root=rb_delete_fixup(root,nod,fix_par);
 
5535
#ifdef EXTRA_DEBUG
5540
5536
  test_rb_tree(root,root->parent);
 
5537
#endif /* EXTRA_DEBUG */
5541
5538
 
5542
5539
  root->use_count=this->use_count;              // Fix root counters
5543
5540
  root->elements=this->elements-1;
5634
5631
    }
5635
5632
  }
5636
5633
  root->color=BLACK;
 
5634
#ifdef EXTRA_DEBUG
5637
5635
  test_rb_tree(root,root->parent);
 
5636
#endif /* EXTRA_DEBUG */
 
5637
 
5638
5638
  return root;
5639
5639
}
5640
5640