diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-01-13 17:13:03 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-01-13 17:13:03 +0200 |
| commit | 9dfada0cba36d75fc3dc49cecefc8c3f9b5114d2 (patch) | |
| tree | 6324f94196720a03ade1a20553305ec6148bf920 /innobase | |
| parent | bf7e46938b8c79f5f9279adb671b7ab56f694435 (diff) | |
| download | mariadb-git-9dfada0cba36d75fc3dc49cecefc8c3f9b5114d2.tar.gz | |
srv0start.c, srv0srv.c:
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
innobase/srv/srv0srv.c:
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
innobase/srv/srv0start.c:
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/srv/srv0srv.c | 4 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 027d7c8fb6e..d2368c5341f 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -2739,8 +2739,6 @@ loop: cnt++; - os_thread_sleep(2000000); - /* Try to track a strange bug reported by Harald Fuchs and others, where the lsn seems to decrease at times */ @@ -2782,6 +2780,8 @@ loop: fflush(stderr); fflush(stdout); + os_thread_sleep(2000000); + if (srv_shutdown_state < SRV_SHUTDOWN_LAST_PHASE) { goto loop; diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index d7a14b8a9ec..e6fdc95fad0 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1512,12 +1512,13 @@ NetWare. */ srv_is_being_started = FALSE; #ifdef UNIV_DEBUG - /* Wait a while so that creates threads have time to suspend themselves - before we switch sync debugging on; otherwise a thread may execute - mutex_enter() before the checks are on, and mutex_exit() after the - checks are on. */ + /* Wait a while so that the created threads have time to suspend + themselves before we switch sync debugging on; otherwise a thread may + execute mutex_enter() before the checks are on, and mutex_exit() after + the checks are on, which will cause an assertion failure in sync + debug. */ - os_thread_sleep(2000000); + os_thread_sleep(3000000); #endif sync_order_checks_on = TRUE; |