diff options
author | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
---|---|---|
committer | unknown <heikki@donna.mysql.fi> | 2002-01-28 22:18:49 +0200 |
commit | ac540e96a915c30034a4fc03ef65b60b8392f664 (patch) | |
tree | aa7f771761883b28925048ff5e37e2eb85d77c00 /innobase/sync | |
parent | 2aa572433b9ce47a511958ce263c8400c2e81ac3 (diff) | |
download | mariadb-git-ac540e96a915c30034a4fc03ef65b60b8392f664.tar.gz |
Many files:
Merge InnoDB-.48
sql/ha_innobase.cc:
Merge InnoDB-.48
innobase/include/dict0dict.h:
Merge InnoDB-.48
innobase/include/dict0mem.h:
Merge InnoDB-.48
innobase/include/mem0dbg.h:
Merge InnoDB-.48
innobase/include/mem0mem.h:
Merge InnoDB-.48
innobase/include/que0que.h:
Merge InnoDB-.48
innobase/include/row0mysql.h:
Merge InnoDB-.48
innobase/include/srv0srv.h:
Merge InnoDB-.48
innobase/include/trx0sys.h:
Merge InnoDB-.48
innobase/include/trx0trx.h:
Merge InnoDB-.48
innobase/include/mem0mem.ic:
Merge InnoDB-.48
innobase/dict/dict0dict.c:
Merge InnoDB-.48
innobase/dict/dict0mem.c:
Merge InnoDB-.48
innobase/log/log0recv.c:
Merge InnoDB-.48
innobase/mem/mem0dbg.c:
Merge InnoDB-.48
innobase/mem/mem0mem.c:
Merge InnoDB-.48
innobase/pars/lexyy.c:
Merge InnoDB-.48
innobase/que/que0que.c:
Merge InnoDB-.48
innobase/rem/rem0rec.c:
Merge InnoDB-.48
innobase/row/row0mysql.c:
Merge InnoDB-.48
innobase/row/row0sel.c:
Merge InnoDB-.48
innobase/srv/srv0srv.c:
Merge InnoDB-.48
innobase/sync/sync0arr.c:
Merge InnoDB-.48
innobase/trx/trx0sys.c:
Merge InnoDB-.48
innobase/trx/trx0trx.c:
Merge InnoDB-.48
innobase/trx/trx0undo.c:
Merge InnoDB-.48
Diffstat (limited to 'innobase/sync')
-rw-r--r-- | innobase/sync/sync0arr.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index c41754316d0..7788b104120 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -913,6 +913,17 @@ sync_array_print_long_waits(void) noticed = TRUE; } + + if (cell->wait_object != NULL + && difftime(time(NULL), cell->reservation_time) > 420) { + + fprintf(stderr, +"InnoDB: Error: semaphore wait has lasted > 420 seconds\n" +"InnoDB: We intentionally crash the server, because it appears to be hung.\n" + ); + + ut_a(0); + } } if (noticed) { |