← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-14 20:42:14 UTC
  • mto: (2318.6.3 refactor7)
  • mto: This revision was merged to the branch mainline in revision 2337.
  • Revision ID: olafvdspek@gmail.com-20110614204214-gswvc2b6fr113758
Remove malloc NULL check. Just die.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
574
574
  sz= sizeof(optimizer::KeyField) *
575
575
      (((session->lex().current_select->cond_count+1)*2 +
576
576
        session->lex().current_select->between_count)*m+1);
577
 
  if (! (key_fields= (optimizer::KeyField*) session->getMemRoot()->allocate(sz)))
578
 
    return true;
 
577
  key_fields= (optimizer::KeyField*) session->getMemRoot()->allocate(sz);
579
578
  and_level= 0;
580
579
  field= end= key_fields;
581
580
 
582
 
  if (my_init_dynamic_array(keyuse, sizeof(optimizer::KeyUse), 20, 64))
583
 
    return true;
 
581
  my_init_dynamic_array(keyuse, sizeof(optimizer::KeyUse), 20, 64);
584
582
  if (cond)
585
583
  {
586
584
    add_key_fields(join_tab->join, &end, &and_level, cond, normal_tables,
685
683
      keyuse->set_size(i);
686
684
    }
687
685
  }
688
 
  return false;
 
686
  return false; // return void
689
687
}
690
688
 
691
689
/**