Merge lp:~skinny.moey/drizzle/transaction_log_670971 into lp:drizzle/7.0

[Joe Daly]

add call to trx_free_for_mysql() shutdown was hanging if the trx log was enabled.

[David Shrewsbury (dshrews)]

Still seeing drizzled processes lying around after merging this branch in with trunk.

review: Needs Fixing

[David Shrewsbury (dshrews)]

Apparently my code was not up-to-date. This fix works.

review: Approve

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-10-30 01:01:48 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-11-05 01:43:41 +0000
@@ -8287,7 +8287,11 @@
   trx->id= trx_sys_get_new_trx_id();
   mutex_exit(&kernel_mutex);
 
-  return (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
+  uint64_t transaction_id= (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
+
+  trx_free_for_mysql(trx);
+
+  return transaction_id;
 }
 
 /*******************************************************************//**