diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-11 14:49:38 +0300 |
| commit | 26bf87c9391edb1df27d1a1e42a98ccf9215f6b1 (patch) | |
| tree | 780174860f876a082066a96b632c69be18d7282f /innobase/sync | |
| parent | d221f3ff172305e4576505180408e4ac2ba2a6c2 (diff) | |
| parent | 6a06c4c534ac68f9d0469f31c869fe1d20b1e463 (diff) | |
| download | mariadb-git-26bf87c9391edb1df27d1a1e42a98ccf9215f6b1.tar.gz | |
Merge with 3.23.53
Build-tools/Do-compile:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
sql/ha_innodb.h:
Auto merged
Docs/manual.texi:
merge
sql/ha_innodb.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'innobase/sync')
| -rw-r--r-- | innobase/sync/sync0arr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index 4d14c32b1ae..4854b40409e 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -924,7 +924,7 @@ sync_array_print_long_waits(void) } if (cell->wait_object != NULL - && difftime(time(NULL), cell->reservation_time) > 420) { + && difftime(time(NULL), cell->reservation_time) > 600) { fprintf(stderr, "InnoDB: Error: semaphore wait has lasted > 600 seconds\n" |