~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0trx.c

Fixes Bug #530870

* in drizzled/lock.cc, the involved_engines calculation was incorrectly
  using getSlot() instead of the new unified MonitoredInTransaction::getId()
  method for determining uniqueness.
* Removed InnoDB's trx_t's active_trans data member.  Now using only
  trx_t's conc_state member to determine state of the transaction (imagine that.)
  Added asserts() to test some assumptions about when and how a trx_t's
  conc_state can and cannot be in TRX_NOT_STARTED state.
* Remove getSlot() from plugin::StorageEngine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
120
120
 
121
121
        trx->mysql_thd = NULL;
122
122
        trx->mysql_query_str = NULL;
123
 
        trx->active_trans = 0;
124
123
        trx->duplicates = 0;
125
124
 
126
125
        trx->mysql_n_tables_locked = 0;