database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
innobase/include/sync0arr.h:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
innobase/srv/srv0srv.c:
  SCCS merged
This commit is contained in:
unknown
2004-10-08 15:43:27 +03:00
parent 57fedc4070 66bdcf8439
commit b5f445a0e9
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
innobase/srv/srv0srv.c
View File

@ -1810,7 +1810,8 @@ srv_error_monitor_thread(
/* in: a dummy parameter required by
os_thread_create */
{
ulint cnt = 0;
/* number of successive fatal timeouts observed */
ulint fatal_cnt = 0;
dulint old_lsn;
dulint new_lsn;
@ -1823,8 +1824,6 @@ srv_error_monitor_thread(
loop:
srv_error_monitor_active = TRUE;
cnt++;
/* Try to track a strange bug reported by Harald Fuchs and others,
where the lsn seems to decrease at times */
@ -1851,7 +1850,20 @@ loop:
srv_refresh_innodb_monitor_stats();
}
sync_array_print_long_waits();
if (sync_array_print_long_waits()) {
fatal_cnt++;
if (fatal_cnt > 5) {
fprintf(stderr,
"InnoDB: Error: semaphore wait has lasted > %lu seconds\n"
"InnoDB: We intentionally crash the server, because it appears to be hung.\n",
srv_fatal_semaphore_wait_threshold);
ut_error;
}
} else {
fatal_cnt = 0;
}
/* Flush stderr so that a database user gets the output
to possible MySQL error file */