← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Jay Pipes
  • Date: 2010-04-20 18:14:52 UTC
  • mto: This revision was merged to the branch mainline in revision 1501.
  • Revision ID: jpipes@serialcoder-20100420181452-l57dtelwond5xt6g
Cursor::write_row() -> Cursor::doInsertRecord().  Cursor::ha_write_row() -> Cursor::insertRecord()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2360
2360
          item->save_in_result_field(1);
2361
2361
      }
2362
2362
      copy_sum_funcs(sum_funcs_end[i+1], sum_funcs_end[i]);
2363
 
      if ((write_error= table_arg->cursor->ha_write_row(table_arg->record[0])))
 
2363
      if ((write_error= table_arg->cursor->insertRecord(table_arg->record[0])))
2364
2364
      {
2365
2365
  if (create_myisam_from_heap(session, table_arg,
2366
2366
                                    tmp_table_param.start_recinfo,
2817
2817
    {
2818
2818
      int error;
2819
2819
      join->found_records++;
2820
 
      if ((error=table->cursor->ha_write_row(table->record[0])))
 
2820
      if ((error=table->cursor->insertRecord(table->record[0])))
2821
2821
      {
2822
2822
        if (!table->cursor->is_fatal_error(error, HA_CHECK_DUP))
2823
2823
          goto end;
2899
2899
  }
2900
2900
  init_tmptable_sum_functions(join->sum_funcs);
2901
2901
  copy_funcs(join->tmp_table_param.items_to_copy);
2902
 
  if ((error=table->cursor->ha_write_row(table->record[0])))
 
2902
  if ((error=table->cursor->insertRecord(table->record[0])))
2903
2903
  {
2904
2904
    if (create_myisam_from_heap(join->session, table,
2905
2905
                                join->tmp_table_param.start_recinfo,
2932
2932
  copy_fields(&join->tmp_table_param);          // Groups are copied twice.
2933
2933
  copy_funcs(join->tmp_table_param.items_to_copy);
2934
2934
 
2935
 
  if (!(error= table->cursor->ha_write_row(table->record[0])))
 
2935
  if (!(error= table->cursor->insertRecord(table->record[0])))
2936
2936
    join->send_records++;                       // New group
2937
2937
  else
2938
2938
  {