← 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-01 05:22:14 UTC
  • mfrom: (1919.3.53 drizzle_pbms)
  • Revision ID: me@mark.atwood.name-20110801052214-3wdsx3xgld6b5v4f
merge lp:~barry-leslie/drizzle/drizzle_pbms

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2502
2502
           ref_pointer_array_size);
2503
2503
    if ((!having || having->val_int()))
2504
2504
    {
 
2505
      int write_error;
 
2506
      Item *item;
2505
2507
      List<Item>::iterator it(rollup.getFields()[i].begin());
2506
 
      while (Item* item= it++)
 
2508
      while ((item= it++))
2507
2509
      {
2508
2510
        if (item->type() == Item::NULL_ITEM && item->is_result_field())
2509
2511
          item->save_in_result_field(1);
2510
2512
      }
2511
2513
      copy_sum_funcs(sum_funcs_end[i+1], sum_funcs_end[i]);
2512
 
      if (table_arg->cursor->insertRecord(table_arg->getInsertRecord()))
 
2514
      if ((write_error= table_arg->cursor->insertRecord(table_arg->getInsertRecord())))
2513
2515
      {
2514
2516
        my_error(ER_USE_SQL_BIG_RESULT, MYF(0));
2515
2517
        return 1;