← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Jay Pipes
  • Date: 2010-04-20 19:05:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1501.
  • Revision ID: jpipes@serialcoder-20100420190503-8edkw18bdocp7ohy
delete_row() is now deleteRecord() and doDeleteRecord() in Cursor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
5345
5345
    }
5346
5346
    if (having && !having->val_int())
5347
5347
    {
5348
 
      if ((error=cursor->ha_delete_row(record)))
 
5348
      if ((error=cursor->deleteRecord(record)))
5349
5349
        goto err;
5350
5350
      error=cursor->rnd_next(record);
5351
5351
      continue;
5372
5372
      }
5373
5373
      if (table->compare_record(first_field) == 0)
5374
5374
      {
5375
 
        if ((error=cursor->ha_delete_row(record)))
 
5375
        if ((error=cursor->deleteRecord(record)))
5376
5376
          goto err;
5377
5377
      }
5378
5378
      else if (!found)
5467
5467
    }
5468
5468
    if (having && !having->val_int())
5469
5469
    {
5470
 
      if ((error=cursor->ha_delete_row(record)))
 
5470
      if ((error=cursor->deleteRecord(record)))
5471
5471
        goto err;
5472
5472
      continue;
5473
5473
    }
5484
5484
    if (hash_search(&hash, org_key_pos, key_length))
5485
5485
    {
5486
5486
      /* Duplicated found ; Remove the row */
5487
 
      if ((error=cursor->ha_delete_row(record)))
 
5487
      if ((error=cursor->deleteRecord(record)))
5488
5488
        goto err;
5489
5489
    }
5490
5490
    else