database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
This commit is contained in:
unknown
2004-10-20 15:14:06 +03:00
parent 6875cf36d1 aa14d7361d
commit 7bdb93aa7e
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
innobase/srv/srv0srv.c
View File

@ -1820,7 +1820,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;
@ -1833,8 +1834,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 */
@ -1861,7 +1860,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 */