Merge with 4.0.14

2 files changed, 9 insertions, 7 deletions

diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c
index 2609b8f5241..ebead6424c8 100644
--- a/innobase/ut/ut0mem.c
+++ b/innobase/ut/ut0mem.c
@@ -201,7 +201,7 @@ ut_free(
 }
 
 /**************************************************************************
-Frees all allocated memory not freed yet. */
+Frees in shutdown all allocated memory not freed yet. */
 
 void
 ut_free_all_mem(void)
@@ -209,7 +209,7 @@ ut_free_all_mem(void)
 {
         ut_mem_block_t* block;
 
-	os_fast_mutex_lock(&ut_list_mutex);
+        os_fast_mutex_free(&ut_list_mutex);
 
 	while ((block = UT_LIST_GET_FIRST(ut_mem_block_list))) {
 
@@ -222,11 +222,11 @@ ut_free_all_mem(void)
 	        free(block);
 	}
 		                      
-	os_fast_mutex_unlock(&ut_list_mutex);
-
-	ut_a(ut_total_allocated_memory == 0);
-
-        os_fast_mutex_free(&ut_list_mutex);
+	if (ut_total_allocated_memory != 0) {
+		fprintf(stderr,
+"InnoDB: Warning: after shutdown total allocated memory is %lu\n",
+		  ut_total_allocated_memory);
+	}
 }
 
 /**************************************************************************
diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c
index c503cda54b9..4ca113f40ad 100644
--- a/innobase/ut/ut0ut.c
+++ b/innobase/ut/ut0ut.c
@@ -54,6 +54,8 @@ ut_get_high32(
 	ulint	a)	/* in: ulint */
 {
 #if SIZEOF_LONG == 4
+	UT_NOT_USED(a);
+
 	return 0;
 #else
 	return(a >> 32);