From d77f5c79e5f91f17175b73d0dec5ef81092a8b39 Mon Sep 17 00:00:00 2001
From: Sunny Bains <Sunny.Bains@Oracle.Com>
Date: Thu, 10 Jan 2013 10:01:50 +1100
Subject: [PATCH] Bug#13997024 SEGV IN SYNC_ARRAY_CELL_PRINT PRINTING OUT LONG
 SEMAPHORE WAIT DATA

Backport fix from mysql-5.6.
---
 storage/innobase/sync/sync0arr.c      | 4 ++++
 storage/innodb_plugin/sync/sync0arr.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index 60a96fe4388..33b0c8d5304 100644
--- a/storage/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
@@ -936,6 +936,8 @@ sync_array_print_long_waits(
 		return(FALSE);
 	}
 
+	sync_array_enter(sync_primary_wait_array);
+
 	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
 
 		double	diff;
@@ -970,6 +972,8 @@ sync_array_print_long_waits(
 		}
 	}
 
+	sync_array_exit(sync_primary_wait_array);
+
 	if (noticed) {
 		fprintf(stderr,
 			"InnoDB: ###### Starts InnoDB Monitor"
diff --git a/storage/innodb_plugin/sync/sync0arr.c b/storage/innodb_plugin/sync/sync0arr.c
index 90ea50b641b..a9100b7003f 100644
--- a/storage/innodb_plugin/sync/sync0arr.c
+++ b/storage/innodb_plugin/sync/sync0arr.c
@@ -932,6 +932,8 @@ sync_array_print_long_waits(
 		return(FALSE);
 	}
 
+	sync_array_enter(sync_primary_wait_array);
+
 	for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
 
 		double	diff;
@@ -966,6 +968,8 @@ sync_array_print_long_waits(
 		}
 	}
 
+	sync_array_exit(sync_primary_wait_array);
+
 	if (noticed) {
 		fprintf(stderr,
 			"InnoDB: ###### Starts InnoDB Monitor"