diff options
| author | serg@serg.mylan <> | 2004-07-20 00:53:24 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-07-20 00:53:24 +0200 |
| commit | 1f0cd873c5f38287d7d4070608f8d0da239c6077 (patch) | |
| tree | b39cfbb54d66b05cd075839aa58dc3215c8d4146 /innobase/sync | |
| parent | e2d6d838e1fa233aef9817b2ab53050b9aacf1cc (diff) | |
| parent | 64fa4cc1249548a3bfbc97efe8aadc54c3afc33a (diff) | |
| download | mariadb-git-1f0cd873c5f38287d7d4070608f8d0da239c6077.tar.gz | |
manual merged (blame me!)
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0arr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index d1644412fbb..7cd221df6a5 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -895,7 +895,7 @@ sync_arr_wake_threads_if_sema_free(void) } /************************************************************************** -Prints warnings of long semaphore waits to stderr. Currently > 120 sec. */ +Prints warnings of long semaphore waits to stderr. */ void sync_array_print_long_waits(void) @@ -905,6 +905,7 @@ sync_array_print_long_waits(void) ibool old_val; ibool noticed = FALSE; ulint i; + ulint fatal_timeout = srv_fatal_semaphore_wait_threshold; for (i = 0; i < sync_primary_wait_array->n_cells; i++) { @@ -919,12 +920,13 @@ sync_array_print_long_waits(void) } if (cell->wait_object != NULL - && difftime(time(NULL), cell->reservation_time) > 600) { + && difftime(time(NULL), cell->reservation_time) + > fatal_timeout) { - fputs( -"InnoDB: Error: semaphore wait has lasted > 600 seconds\n" + fprintf(stderr, +"InnoDB: Error: semaphore wait has lasted > %lu seconds\n" "InnoDB: We intentionally crash the server, because it appears to be hung.\n", - stderr); + fatal_timeout); ut_error; } |