← 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: Lee Bieber
  • Date: 2010-11-05 20:22:41 UTC
  • mfrom: (1907.1.2 build)
  • Revision ID: kalebral@gmail.com-20101105202241-1fm31t0y0fvdwcd3
Merge Brian - Adding FileSort class, merge in catalog tree
Merge Joe - fix bug 670971: InnoDB does not complete shutdown with transaction log enabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
8287
8287
  trx->id= trx_sys_get_new_trx_id();
8288
8288
  mutex_exit(&kernel_mutex);
8289
8289
 
8290
 
  return (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
 
8290
  uint64_t transaction_id= (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
 
8291
 
 
8292
  trx_free_for_mysql(trx);
 
8293
 
 
8294
  return transaction_id;
8291
8295
}
8292
8296
 
8293
8297
/*******************************************************************//**