summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSunny Bains <Sunny.Bains@Oracle.Com>2013-01-10 10:11:53 +1100
committerSunny Bains <Sunny.Bains@Oracle.Com>2013-01-10 10:11:53 +1100
commit24e053deb49df08cd4710edd8b88e3d1de42d17b (patch)
tree7038539418f0c36a81f21701db19dc93a4bfe5d6 /storage
parent30762aed43375d9ad15a0975e833dbcff12261f4 (diff)
parentdf5444d47ca64f4024c959913974a2a06f75ab14 (diff)
downloadmariadb-git-24e053deb49df08cd4710edd8b88e3d1de42d17b.tar.gz
Merge from mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
-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 c6cbfc94dca..b0c337dc9d7 100644
--- a/storage/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
@@ -945,6 +945,8 @@ sync_array_print_long_waits(
# define SYNC_ARRAY_TIMEOUT 240
#endif
+ sync_array_enter(sync_primary_wait_array);
+
for (i = 0; i < sync_primary_wait_array->n_cells; i++) {
double diff;
@@ -979,6 +981,8 @@ sync_array_print_long_waits(
}
}
+ sync_array_exit(sync_primary_wait_array);
+
if (noticed) {
fprintf(stderr,
"InnoDB: ###### Starts InnoDB Monitor"