← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.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/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
/**
2502
2501
           ref_pointer_array_size);
2503
2502
    if ((!having || having->val_int()))
2504
2503
    {
2505
 
      int write_error;
2506
 
      Item *item;
2507
2504
      List<Item>::iterator it(rollup.getFields()[i].begin());
2508
 
      while ((item= it++))
 
2505
      while (Item* item= it++)
2509
2506
      {
2510
2507
        if (item->type() == Item::NULL_ITEM && item->is_result_field())
2511
2508
          item->save_in_result_field(1);
2512
2509
      }
2513
2510
      copy_sum_funcs(sum_funcs_end[i+1], sum_funcs_end[i]);
2514
 
      if ((write_error= table_arg->cursor->insertRecord(table_arg->getInsertRecord())))
 
2511
      if (table_arg->cursor->insertRecord(table_arg->getInsertRecord()))
2515
2512
      {
2516
2513
        my_error(ER_USE_SQL_BIG_RESULT, MYF(0));
2517
2514
        return 1;
2919
2916
 
2920
2917
          join->select_options^= OPTION_FOUND_ROWS;
2921
2918
          if (table->sort.record_pointers ||
2922
 
              (table->sort.io_cache && my_b_inited(table->sort.io_cache)))
 
2919
              (table->sort.io_cache && table->sort.io_cache->inited()))
2923
2920
          {
2924
2921
            /* Using filesort */
2925
2922
            join->send_records= table->sort.found_records;