← Back to branch summary

~patrick-crews/drizzle/qp-merge2

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Patrick Crews
  • Date: 2012-02-20 22:04:21 UTC
  • mfrom: (2483.1.30 drizzle)
  • Revision ID: gleebix@gmail.com-20120220220421-9a77n2wnglo211r0
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
395
395
  free_blobs(table);                            /* if pack_blob was used */
396
396
  table->copy_blobs=0;
397
397
  session->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;
398
 
  /*
399
 
     simulated killing in the middle of per-row loop
400
 
     must be effective for binlogging
401
 
  */
402
 
  if (error) 
 
398
 
 
399
  if (error)
403
400
  {
404
401
    error= -1;                          // Error on read
405
402
    goto err;
412
409
  if (session->transaction.stmt.hasModifiedNonTransData())
413
410
    session->transaction.all.markModifiedNonTransData();
414
411
 
415
 
  /* ok to client sent only after binlog write and engine commit */
416
412
  session->my_ok(info.copied + info.deleted, 0, 0L, msg);
417
413
err:
418
414
  assert(transactional_table || !(info.copied || info.deleted) ||