← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-74

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Continuous Integration
  • Date: 2012-08-14 23:23:41 UTC
  • mfrom: (2580.1.1 workspace)
  • Revision ID: ci@drizzle.org-20120814232341-9hubn5aeit4mkcz6
added:
  bootstrap.sh
modified:
  client/drizzletest.cc
  drizzled/field/datetime.cc
  drizzled/filesort.cc
  drizzled/function/time/unix_timestamp.cc
  drizzled/sql_insert.cc
  drizzled/sql_load.cc
  drizzled/sql_union.cc
  drizzled/table/cache.cc
  drizzled/table_function_container.cc
  plugin/logging_query/logging_query.cc
  plugin/schema_engine/schema.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-08-11 [merge] added:

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
456
456
      if (session->transaction.stmt.hasModifiedNonTransData())
457
457
        session->transaction.all.markModifiedNonTransData();
458
458
    }
 
459
    (void)(transactional_table);
459
460
    assert(transactional_table || !changed || session->transaction.stmt.hasModifiedNonTransData());
460
461
 
461
462
  }
1394
1395
 
1395
1396
    changed= (info.copied || info.deleted || info.updated);
1396
1397
    transactional_table= table->cursor->has_transactions();
 
1398
    (void)(transactional_table);
 
1399
    (void)(changed);
1397
1400
    assert(transactional_table || !changed ||
1398
1401
                session->transaction.stmt.hasModifiedNonTransData());
1399
1402
    table->cursor->ha_release_auto_increment();