← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
454
454
  init_read_record(&info,session,table,select,0,1);
455
455
 
456
456
  updated= found= 0;
457
 
  /* Generate an error when trying to set a NOT NULL field to NULL. */
458
 
  session->count_cuted_fields= ignore ? CHECK_FIELD_WARN
459
 
                                  : CHECK_FIELD_ERROR_FOR_NULL;
460
 
  session->cuted_fields=0L;
 
457
  /*
 
458
   * Per the SQL standard, inserting NULL into a NOT NULL
 
459
   * field requires an error to be thrown.
 
460
   *
 
461
   * @NOTE
 
462
   *
 
463
   * NULL check and handling occurs in field_conv.cc
 
464
   */
 
465
  session->count_cuted_fields= CHECK_FIELD_ERROR_FOR_NULL;
 
466
  session->cuted_fields= 0L;
461
467
  session->set_proc_info("Updating");
462
468
 
463
469
  transactional_table= table->file->has_transactions();