← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2010-04-21 02:28:11 UTC
  • mfrom: (1491.1.4 cleanup-cursor)
  • Revision ID: brian@gaz-20100421022811-4fl7zzze4fprgyp7
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
4215
4215
        copy_sum_funcs(join->sum_funcs, join->sum_funcs_end[send_group_parts]);
4216
4216
        if (!join->having || join->having->val_int())
4217
4217
        {
4218
 
          int error= table->cursor->ha_write_row(table->record[0]);
 
4218
          int error= table->cursor->insertRecord(table->record[0]);
4219
4219
          if (error && create_myisam_from_heap(join->session, table,
4220
4220
                                              join->tmp_table_param.start_recinfo,
4221
4221
                                                &join->tmp_table_param.recinfo,
5344
5344
    }
5345
5345
    if (having && !having->val_int())
5346
5346
    {
5347
 
      if ((error=cursor->ha_delete_row(record)))
 
5347
      if ((error=cursor->deleteRecord(record)))
5348
5348
        goto err;
5349
5349
      error=cursor->rnd_next(record);
5350
5350
      continue;
5371
5371
      }
5372
5372
      if (table->compare_record(first_field) == 0)
5373
5373
      {
5374
 
        if ((error=cursor->ha_delete_row(record)))
 
5374
        if ((error=cursor->deleteRecord(record)))
5375
5375
          goto err;
5376
5376
      }
5377
5377
      else if (!found)
5466
5466
    }
5467
5467
    if (having && !having->val_int())
5468
5468
    {
5469
 
      if ((error=cursor->ha_delete_row(record)))
 
5469
      if ((error=cursor->deleteRecord(record)))
5470
5470
        goto err;
5471
5471
      continue;
5472
5472
    }
5483
5483
    if (hash_search(&hash, org_key_pos, key_length))
5484
5484
    {
5485
5485
      /* Duplicated found ; Remove the row */
5486
 
      if ((error=cursor->ha_delete_row(record)))
 
5486
      if ((error=cursor->deleteRecord(record)))
5487
5487
        goto err;
5488
5488
    }
5489
5489
    else