← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Lee Bieber
  • Date: 2010-12-03 01:16:19 UTC
  • mfrom: (1819.9.81 update-innobase)
  • Revision ID: kalebral@gmail.com-20101203011619-n6v584rijwdet05b
Merge Stewart - update Innobase plugin based on InnoDB 1.1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2814
2814
  if (!end_of_records)
2815
2815
  {
2816
2816
    copy_fields(&join->tmp_table_param);
2817
 
    copy_funcs(join->tmp_table_param.items_to_copy);
 
2817
    if (copy_funcs(join->tmp_table_param.items_to_copy, join->session))
 
2818
      return NESTED_LOOP_ERROR;
2818
2819
    if (!join->having || join->having->val_int())
2819
2820
    {
2820
2821
      int error;
2899
2900
      memcpy(table->getInsertRecord()+key_part->offset, group->buff, 1);
2900
2901
  }
2901
2902
  init_tmptable_sum_functions(join->sum_funcs);
2902
 
  copy_funcs(join->tmp_table_param.items_to_copy);
 
2903
  if (copy_funcs(join->tmp_table_param.items_to_copy, join->session))
 
2904
    return NESTED_LOOP_ERROR;
2903
2905
  if ((error=table->cursor->insertRecord(table->getInsertRecord())))
2904
2906
  {
2905
2907
    my_error(ER_USE_SQL_BIG_RESULT, MYF(0));
2925
2927
 
2926
2928
  init_tmptable_sum_functions(join->sum_funcs);
2927
2929
  copy_fields(&join->tmp_table_param);          // Groups are copied twice.
2928
 
  copy_funcs(join->tmp_table_param.items_to_copy);
 
2930
  if (copy_funcs(join->tmp_table_param.items_to_copy, join->session))
 
2931
    return NESTED_LOOP_ERROR;
2929
2932
 
2930
2933
  if (!(error= table->cursor->insertRecord(table->getInsertRecord())))
2931
2934
    join->send_records++;                       // New group