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

[Alexey Kopytov]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/171/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/storage/innobase/include/ut0mem.h'
--- Percona-Server/storage/innobase/include/ut0mem.h	2013-05-31 09:12:04 +0000
+++ Percona-Server/storage/innobase/include/ut0mem.h	2013-07-02 07:12:38 +0000
@@ -92,22 +92,6 @@
 Allocates memory. */
 #define ut_malloc(n) ut_malloc_low(n, TRUE)
 /**********************************************************************//**
-Allocates cleared memory, provides calloc()-like interface.
-@return own: allocated memory */
-UNIV_INTERN
-void*
-ut_calloc_low(
-/*==========*/
-	ulint	n,			/*!< in: number of elements */
-	ulint	c,			/*!< in: size of an element */
-	ibool	assert_on_error)	/*!< in: if TRUE, we crash mysqld if
-					the memory cannot be allocated */
-	__attribute__((malloc));
-/**********************************************************************//**
-Allocates cleared memory, provides calloc()-like interface.
-@return own: allocated memory */
-#define ut_calloc(n, c) ut_calloc_low(n, c, TRUE)
-/**********************************************************************//**
 Frees a memory block allocated with ut_malloc. Freeing a NULL pointer is
 a nop. */
 UNIV_INTERN

=== modified file 'Percona-Server/storage/innobase/trx/trx0trx.cc'
--- Percona-Server/storage/innobase/trx/trx0trx.cc	2013-06-25 13:13:06 +0000
+++ Percona-Server/storage/innobase/trx/trx0trx.cc	2013-07-02 07:12:38 +0000
@@ -225,7 +225,7 @@
 	mem_heap_t*	heap;
 	ib_alloc_t*	heap_alloc;
 
-	trx = static_cast<trx_t*>(ut_calloc(1, sizeof(*trx)));
+	trx = static_cast<trx_t*>(mem_zalloc(sizeof(*trx)));
 
 	mutex_create(trx_mutex_key, &trx->mutex, SYNC_TRX);
 
@@ -381,7 +381,7 @@
 
 	read_view_free(trx->prebuilt_view);
 
-	ut_free(trx);
+	mem_free(trx);
 }
 
 /********************************************************************//**

=== modified file 'Percona-Server/storage/innobase/ut/ut0mem.cc'
--- Percona-Server/storage/innobase/ut/ut0mem.cc	2013-05-31 09:12:04 +0000
+++ Percona-Server/storage/innobase/ut/ut0mem.cc	2013-07-02 07:12:38 +0000
@@ -206,41 +206,6 @@
 }
 
 /**********************************************************************//**
-Allocates cleared memory, provides calloc()-like interface.
-@return own: allocated memory */
-UNIV_INTERN
-void*
-ut_calloc_low(
-/*==========*/
-	ulint	n,			/*!< in: number of elements */
-	ulint	c,			/*!< in: size of an element */
-	ibool	assert_on_error)	/*!< in: if TRUE, we crash mysqld if
-					the memory cannot be allocated */
-{
-	void*	ret;
-
-	if (UNIV_LIKELY(srv_use_sys_malloc)) {
-
-		ret = calloc(n, c);
-		ut_a(ret || !assert_on_error);
-
-		return ret;
-	}
-
-	ret = ut_malloc(n * c);
-
-	if (UNIV_LIKELY(ret != NULL)) {
-
-		memset(ret, 0, n * c);
-	} else {
-
-		ut_a(!assert_on_error);
-	}
-
-	return ret;
-}
-
-/**********************************************************************//**
 Frees a memory block allocated with ut_malloc. Freeing a NULL pointer is
 a nop. */
 UNIV_INTERN