diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
| commit | 005c7e54214546584c8dc67a746e215f8dbe4b58 (patch) | |
| tree | dea50cd7b32808413e058d43d20cf230d1cc7477 /storage/innobase/srv/srv0srv.c | |
| parent | b9f220b45afaae9b61af29129a8c8ec5f9a7759b (diff) | |
| parent | 4f5c10e6b565bc2761b9d083e25c6a36141552a0 (diff) | |
| download | mariadb-git-005c7e54214546584c8dc67a746e215f8dbe4b58.tar.gz | |
mysql-5.5.32 merge
Diffstat (limited to 'storage/innobase/srv/srv0srv.c')
| -rw-r--r-- | storage/innobase/srv/srv0srv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c index 86caf9d4243..849e97b31f7 100644 --- a/storage/innobase/srv/srv0srv.c +++ b/storage/innobase/srv/srv0srv.c @@ -1719,7 +1719,8 @@ srv_suspend_mysql_thread( finish_time = (ib_int64_t) sec * 1000000 + ms; } - diff_time = (ulint) (finish_time - start_time); + diff_time = (finish_time > start_time) ? + (ulint) (finish_time - start_time) : 0; srv_n_lock_wait_current_count--; srv_n_lock_wait_time = srv_n_lock_wait_time + diff_time; |