← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 02:00:55 UTC
  • mfrom: (2155.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211020055-xck466i0geihtgc8
Merge Stewart - moves mark_transaction_to_rollback to be a method in Session
Merge Vijay -  715789: test-drizzle, test-jp etc dont run check
Merge Stewart - 565053: Fork to background

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
271
271
  case DB_DEADLOCK:
272
272
    /* HailDB will roll back a transaction itself due to DB_DEADLOCK.
273
273
       This means we have to tell Drizzle about it */
274
 
    mark_transaction_to_rollback(session, true);
 
274
    session->markTransactionForRollback(true);
275
275
    return HA_ERR_LOCK_DEADLOCK;
276
276
 
277
277
  case DB_LOCK_WAIT_TIMEOUT: