diff options
| author | marko@hundin.mysql.fi <> | 2004-10-13 11:29:57 +0300 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-10-13 11:29:57 +0300 |
| commit | ab316c36db43f20f22394157e35ad43731c140f0 (patch) | |
| tree | d87fe2e2b0be389709fee21d9b3646b230d7338e | |
| parent | b40261262ae2c4c3051f5f22b92edfa084dc8acd (diff) | |
| download | mariadb-git-ab316c36db43f20f22394157e35ad43731c140f0.tar.gz | |
InnoDB: correct potential overflow in trx_purge()
| -rw-r--r-- | innobase/trx/trx0purge.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/innobase/trx/trx0purge.c b/innobase/trx/trx0purge.c index 1a4ef6a2e99..5c62640e011 100644 --- a/innobase/trx/trx0purge.c +++ b/innobase/trx/trx0purge.c @@ -1057,12 +1057,15 @@ trx_purge(void) && !UT_LIST_GET_LAST(trx_sys->view_list)) { float ratio = (float) trx_sys->rseg_history_len / srv_max_purge_lag; - if (ratio > 1) { + if (ratio > ULINT_MAX / 10000) { + /* Avoid overflow: maximum delay is 4295 seconds */ + srv_dml_needed_delay = ULINT_MAX; + } else if (ratio > 1) { /* If the history list length exceeds the innodb_max_purge_lag, the data manipulation statements are delayed by at least 5000 microseconds. */ - srv_dml_needed_delay = (ratio - .5) * 10000; + srv_dml_needed_delay = (ulint) ((ratio - .5) * 10000); } } |