← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2011-01-26 06:48:39 UTC
  • mfrom: (2114.5.2 timestamp)
  • Revision ID: brian@tangent.org-20110126064839-nfcmqoqu08x22pdo
Merge in time tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
454
454
  session->set_proc_info("Updating");
455
455
 
456
456
  transactional_table= table->cursor->has_transactions();
457
 
  session->abort_on_warning= test(!ignore);
 
457
  session->setAbortOnWarning(test(!ignore));
458
458
 
459
459
  /*
460
460
    Assure that we can use position()
580
580
    session->status_var.updated_row_count+= session->row_count_func;
581
581
  }
582
582
  session->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;              /* calc cuted fields */
583
 
  session->abort_on_warning= 0;
 
583
  session->setAbortOnWarning(false);
584
584
  DRIZZLE_UPDATE_DONE((error >= 0 || session->is_error()), found, updated);
585
585
  return ((error >= 0 || session->is_error()) ? 1 : 0);
586
586
 
595
595
    table->key_read=0;
596
596
    table->cursor->extra(HA_EXTRA_NO_KEYREAD);
597
597
  }
598
 
  session->abort_on_warning= 0;
 
598
  session->setAbortOnWarning(false);
599
599
 
600
600
  DRIZZLE_UPDATE_DONE(1, 0, 0);
601
601
  return 1;