← 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-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/join.cc
1875
1875
  exec_tmp_table1= NULL;
1876
1876
  exec_tmp_table2= NULL;
1877
1877
  delete select;
1878
 
  delete_dynamic(&keyuse);
1879
 
 
1880
 
  return(error);
 
1878
  keyuse.free();
 
1879
  return error;
1881
1880
}
1882
1881
 
1883
1882
/**
2917
2916
 
2918
2917
          join->select_options^= OPTION_FOUND_ROWS;
2919
2918
          if (table->sort.record_pointers ||
2920
 
              (table->sort.io_cache && my_b_inited(table->sort.io_cache)))
 
2919
              (table->sort.io_cache && table->sort.io_cache->inited()))
2921
2920
          {
2922
2921
            /* Using filesort */
2923
2922
            join->send_records= table->sort.found_records;