← Back to branch summary

~vjsamuel/drizzle/fix-bug-850898

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Mark Atwood
  • Date: 2011-08-17 19:14:47 UTC
  • mfrom: (2385.3.17 rf)
  • Revision ID: me@mark.atwood.name-20110817191447-h86yzddvycd0xmof
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
147
147
 
148
148
namespace drizzled {
149
149
 
150
 
#define HA_END_SPACE_KEY 0
 
150
static const int HA_END_SPACE_KEY= 0;
151
151
 
152
152
/*
153
153
  Convert double value to #rows. Currently this does floor(), and we
379
379
{
380
380
  quick_keys.reset();
381
381
  needed_reg.reset();
382
 
  my_b_clear(file);
 
382
  file->clear();
383
383
}
384
384
 
385
385
 
386
386
void optimizer::SqlSelect::cleanup()
387
387
{
388
 
 
389
388
  delete quick;
390
389
  quick= NULL;
391
390
 
2233
2232
            NOT_IN_IGNORE_THRESHOLD, construct the optimizer::SEL_TREE (*) manually.
2234
2233
          * Otherwise, don't produce a optimizer::SEL_TREE.
2235
2234
        */
2236
 
#define NOT_IN_IGNORE_THRESHOLD 1000
 
2235
        const unsigned int NOT_IN_IGNORE_THRESHOLD= 1000;
2237
2236
        memory::Root *tmp_root= param->mem_root;
2238
2237
        param->session->mem_root= param->old_root;
2239
2238
        /*
3184
3183
  return root;
3185
3184
}
3186
3185
 
3187
 
#define CLONE_KEY1_MAYBE 1
3188
 
#define CLONE_KEY2_MAYBE 2
 
3186
static const int CLONE_KEY1_MAYBE= 1;
 
3187
static const int CLONE_KEY2_MAYBE= 2;
3189
3188
 
3190
3189
static uint32_t swap_clone_flag(uint32_t a)
3191
3190
{