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

[Alexey Kopytov]

http://jenkins.percona.com/job/percona-server-5.5-param/782/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/storage/innobase/trx/trx0trx.c'
--- Percona-Server/storage/innobase/trx/trx0trx.c	2013-05-31 13:06:00 +0000
+++ Percona-Server/storage/innobase/trx/trx0trx.c	2013-07-02 07:11:30 +0000
@@ -220,7 +220,7 @@
 	ut_ad(mutex_own(&kernel_mutex));
 	ut_ad(sess);
 
-	trx = ut_malloc(sizeof(trx_t));
+	trx = mem_alloc(sizeof(trx_t));
 
 	trx->magic_n = TRX_MAGIC_N;
 
@@ -489,7 +489,7 @@
 
 	trx_release_descriptor(trx);
 
-	ut_free(trx);
+	mem_free(trx);
 }
 
 /********************************************************************//**
@@ -547,7 +547,7 @@
 
 	ut_ad(trx_sys->descr_n_used <= UT_LIST_GET_LEN(trx_sys->trx_list));
 
-	ut_free(trx);
+	mem_free(trx);
 }
 
 /********************************************************************//**