← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
738
738
    if (sl->test_limit())
739
739
      return(1);
740
740
  }
741
 
  return(0);
 
741
  return 0;
742
742
}
743
743
 
744
744
Item_in_subselect::Item_in_subselect(Item * left_exp,
1122
1122
 
1123
1123
  if (!abort_on_null && left_expr->maybe_null && !pushed_cond_guards)
1124
1124
  {
1125
 
    pushed_cond_guards= (bool*)join->session->mem.alloc(sizeof(bool));
 
1125
    pushed_cond_guards= new (join->session->mem) bool;
1126
1126
    pushed_cond_guards[0]= true;
1127
1127
  }
1128
1128
 
2236
2236
  }
2237
2237
  session->setWhere(save_where);
2238
2238
  session->lex().current_select= save_select;
2239
 
  return(0);
 
2239
  return 0;
2240
2240
}
2241
2241
 
2242
2242
void subselect_single_select_engine::save_join_if_explain()
2435
2435
      break;
2436
2436
    }
2437
2437
  }
2438
 
  return(0);
 
2438
  return 0;
2439
2439
}
2440
2440
 
2441
2441
 
2486
2486
      Can be set in copy_ref_key.
2487
2487
    */
2488
2488
    ((Item_in_subselect *) item)->value= 0;
2489
 
    return(0);
 
2489
    return 0;
2490
2490
  }
2491
2491
 
2492
2492
  if (null_keypart)
2608
2608
      Can be set in copy_ref_key.
2609
2609
    */
2610
2610
    ((Item_in_subselect *) item)->value= 0;
2611
 
    return(0);
 
2611
    return 0;
2612
2612
  }
2613
2613
 
2614
2614
  if (null_keypart)
3057
3057
    - here we initialize only those members that are used by
3058
3058
      subselect_uniquesubquery_engine, so these objects are incomplete.
3059
3059
  */
3060
 
  tab= (JoinTable*) session->mem.alloc(sizeof(JoinTable));
3061
 
  new (tab) JoinTable();
 
3060
  tab= new (session->mem) JoinTable;
3062
3061
  tab->table= tmp_table;
3063
3062
  tab->ref.key= 0; /* The only temp table index. */
3064
3063
  tab->ref.key_length= tmp_key->key_length;