summaryrefslogtreecommitdiff
path: root/innobase/sync
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-12-13 20:54:20 +0200
committerunknown <monty@hundin.mysql.fi>2001-12-13 20:54:20 +0200
commit6e31c2ca7d7881d26c86c29e8abd0e1528d6613b (patch)
tree053b9c4d48bf88ba54d5cf728bfebadb38d1a548 /innobase/sync
parent9385d3aba530562b1ddcecedeb6dd61cd3d63d96 (diff)
parentb554ef6b10db3d6640935cafe0d7ebaf8034ae13 (diff)
downloadmariadb-git-6e31c2ca7d7881d26c86c29e8abd0e1528d6613b.tar.gz
merge
innobase/btr/btr0cur.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/sync/sync0arr.c: Auto merged sql/mysqld.cc: Auto merged sql/table.cc: Auto merged sql/unireg.cc: Auto merged Docs/manual.texi: Merge
Diffstat (limited to 'innobase/sync')
-rw-r--r--innobase/sync/sync0arr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c
index 66d711671dd..573829fcef8 100644
--- a/innobase/sync/sync0arr.c
+++ b/innobase/sync/sync0arr.c
@@ -905,7 +905,7 @@ sync_array_print_long_waits(void)
cell = sync_array_get_nth_cell(sync_primary_wait_array, i);
if (cell->wait_object != NULL
- && difftime(time(NULL), cell->reservation_time) > 120) {
+ && difftime(time(NULL), cell->reservation_time) > 240) {
fprintf(stderr,
"InnoDB: Warning: a long semaphore wait:\n");