← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Joseph Daly
  • Date: 2010-10-21 01:59:17 UTC
  • mto: (1856.2.16 transaction_id_innodb)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: skinny.moey@gmail.com-20101021015917-snhgopy82x1fwcch
rework names for retrieving current trans id

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
348
348
  {
349
349
    return doRollback(session, all); /* XA rollback just does a SQL ROLLBACK */
350
350
  }
351
 
  virtual uint64_t doGetTransactionId(Session *session);
 
351
  virtual uint64_t doGetCurrentTransactionId(Session *session);
 
352
  virtual uint64_t doGetNewTransactionId(Session *session);
352
353
  virtual int doCommit(Session* session, bool all);
353
354
  virtual int doRollback(Session* session, bool all);
354
355
 
8255
8256
  return(error);
8256
8257
}
8257
8258
 
8258
 
uint64_t InnobaseEngine::doGetTransactionId(Session *session)
 
8259
uint64_t InnobaseEngine::doGetCurrentTransactionId(Session *session)
 
8260
{
 
8261
  trx_t *trx = session_to_trx(session);
 
8262
  return (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
 
8263
}
 
8264
 
 
8265
uint64_t InnobaseEngine::doGetNewTransactionId(Session *session)
8259
8266
{
8260
8267
  trx_t *trx= innobase_trx_allocate(session);
8261
8268