← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Monty Taylor
  • Date: 2011-02-15 03:57:13 UTC
  • mfrom: (2168.1.7 build)
  • Revision ID: mordred@inaugust.com-20110215035713-w41jt6izr5r8e8lq
Merge Haildb fixes from Stewart and various small build cleanups from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
277
277
    return HA_ERR_LOCK_DEADLOCK;
278
278
 
279
279
  case DB_LOCK_WAIT_TIMEOUT:
 
280
    session->markTransactionForRollback(false);
280
281
    return HA_ERR_LOCK_WAIT_TIMEOUT;
281
282
 
282
283
  case DB_NO_REFERENCED_ROW: