summaryrefslogtreecommitdiff
path: root/storage/innobase/sync
diff options
context:
space:
mode:
authorSunny Bains <Sunny.Bains@Oracle.Com>2013-01-10 10:01:50 +1100
committerSunny Bains <Sunny.Bains@Oracle.Com>2013-01-10 10:01:50 +1100
commitd77f5c79e5f91f17175b73d0dec5ef81092a8b39 (patch)
treec577f425a496ca065b5f5502e2b254c872b613af /storage/innobase/sync
parent0319ba84b964dd3c862d1a3fc6e4b625c6e31a1f (diff)
downloadmariadb-git-d77f5c79e5f91f17175b73d0dec5ef81092a8b39.tar.gz
Bug#13997024 SEGV IN SYNC_ARRAY_CELL_PRINT PRINTING OUT LONG SEMAPHORE WAIT DATA
Backport fix from mysql-5.6.
Diffstat (limited to 'storage/innobase/sync')
-rw-r--r--storage/innobase/sync/sync0arr.c4
1 files changed, 4 insertions, 0 deletions
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"