Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~akopytov/percona-server/bug1189743-5.5 into lp:percona-server/5.5

  1. bug1189743-5.5
  2. Merge into 5.5
Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 552
Proposed branch: lp:~akopytov/percona-server/bug1189743-5.5
Merge into: lp:percona-server/5.5
Diff against target: 30 lines (+3/-3)
1 file modified
Percona-Server/storage/innobase/trx/trx0trx.c (+3/-3)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug1189743-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Registry Administrators Pending
Review via email: mp+172471@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/trx/trx0trx.c'
2--- Percona-Server/storage/innobase/trx/trx0trx.c 2013-05-31 13:06:00 +0000
3+++ Percona-Server/storage/innobase/trx/trx0trx.c 2013-07-02 07:11:30 +0000
4@@ -220,7 +220,7 @@
5 ut_ad(mutex_own(&kernel_mutex));
6 ut_ad(sess);
7
8- trx = ut_malloc(sizeof(trx_t));
9+ trx = mem_alloc(sizeof(trx_t));
10
11 trx->magic_n = TRX_MAGIC_N;
12
13@@ -489,7 +489,7 @@
14
15 trx_release_descriptor(trx);
16
17- ut_free(trx);
18+ mem_free(trx);
19 }
20
21 /********************************************************************//**
22@@ -547,7 +547,7 @@
23
24 ut_ad(trx_sys->descr_n_used <= UT_LIST_GET_LEN(trx_sys->trx_list));
25
26- ut_free(trx);
27+ mem_free(trx);
28 }
29
30 /********************************************************************//**

Subscribers

People subscribed via source and target branches