← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Mark Atwood
  • Date: 2011-07-03 16:14:16 UTC
  • mfrom: (2353.3.1 drizzle)
  • Revision ID: me@mark.atwood.name-20110703161416-qho1b6h299v1w6i6
merge lp:~fallenpegasus/drizzle/fix-cppcheck-redundantIfDelete

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2806
2806
 
2807
2807
  if (join_tab->use_quick == 2)
2808
2808
  {
2809
 
    if (join_tab->select->quick)
2810
 
    {                                   /* Used quick select last. reset it */
2811
 
      delete join_tab->select->quick;
2812
 
      join_tab->select->quick=0;
2813
 
    }
 
2809
    delete join_tab->select->quick;
 
2810
    join_tab->select->quick= 0;
2814
2811
  }
2815
2812
  /* read through all records */
2816
2813
  if ((error=join_init_read_record(join_tab)))