← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Henrik Ingo
  • Date: 2011-09-23 06:14:37 UTC
  • mfrom: (2425 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: henrik.ingo@avoinelama.fi-20110923061437-ct1wedkb9s47uy2t
Merge newest trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
566
566
  optimizer::KeyField* end, *field;
567
567
  field= end= key_fields;
568
568
 
569
 
  my_init_dynamic_array(keyuse, sizeof(optimizer::KeyUse), 20, 64);
 
569
  keyuse->init(sizeof(optimizer::KeyUse), 20, 64);
570
570
  if (cond)
571
571
  {
572
572
    add_key_fields(join_tab->join, &end, &and_level, cond, normal_tables,
5832
5832
 
5833
5833
err:
5834
5834
  if (copy)
5835
 
    delete [] param->copy_field;                        // This is never 0
 
5835
    delete[] param->copy_field;
5836
5836
  param->copy_field=0;
5837
5837
  return true;
5838
5838
}