Drizzle

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

  1. transaction_log_670971
  2. Merge into 7.0
Proposed by Joe Daly
Status: Merged
Approved by: David Shrewsbury
Approved revision: 1904
Merged at revision: 1908
Proposed branch: lp:~skinny.moey/drizzle/transaction_log_670971
Merge into: lp:drizzle/7.0
Diff against target: 16 lines (+5/-1)
1 file modified
plugin/innobase/handler/ha_innodb.cc (+5/-1)
To merge this branch: bzr merge lp:~skinny.moey/drizzle/transaction_log_670971
Reviewer Review Type Date Requested Status
David Shrewsbury (community) Approve
Review via email: mp+40159@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
David Shrewsbury (dshrews) wrote :

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

review: Needs Fixing
Revision history for this message
David Shrewsbury (dshrews) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/innobase/handler/ha_innodb.cc'
2--- plugin/innobase/handler/ha_innodb.cc 2010-10-30 01:01:48 +0000
3+++ plugin/innobase/handler/ha_innodb.cc 2010-11-05 01:43:41 +0000
4@@ -8287,7 +8287,11 @@
5 trx->id= trx_sys_get_new_trx_id();
6 mutex_exit(&kernel_mutex);
7
8- return (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
9+ uint64_t transaction_id= (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
10+
11+ trx_free_for_mysql(trx);
12+
13+ return transaction_id;
14 }
15
16 /*******************************************************************//**

Subscribers

People subscribed via source and target branches