← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

Style cleanup around TransactionContext::modified_non_trans_table and dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
390
390
  sprintf(name, ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
391
391
          (uint32_t) (info.records - info.copied), (uint32_t) session->cuted_fields);
392
392
 
393
 
  if (session->transaction.stmt.modified_non_trans_table)
394
 
    session->transaction.all.modified_non_trans_table= true;
 
393
  if (session->transaction.stmt.hasModifiedNonTransData())
 
394
    session->transaction.all.markModifiedNonTransData();
395
395
 
396
396
  /* ok to client sent only after binlog write and engine commit */
397
397
  session->my_ok(info.copied + info.deleted, 0, 0L, name);
398
398
err:
399
399
  assert(transactional_table || !(info.copied || info.deleted) ||
400
 
              session->transaction.stmt.modified_non_trans_table);
 
400
              session->transaction.stmt.hasModifiedNonTransData());
401
401
  table->cursor->ha_release_auto_increment();
402
402
  table->auto_increment_field_not_null= false;
403
403
  session->abort_on_warning= 0;