diff options
| author | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-03-28 13:35:44 +1100 |
|---|---|---|
| committer | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-03-28 13:35:44 +1100 |
| commit | 83a5a20d81a43425dae8a63ab581eea7864c25c8 (patch) | |
| tree | 67cbfbf19045b666fa61bc74f6873fee5997d492 /storage/innobase/trx | |
| parent | 10120d363dbde6f825d4b9ce3226b7e3bf374c7d (diff) | |
| parent | 65126ffa57554a7a6e76ad63c2938288ef4ca59c (diff) | |
| download | mariadb-git-83a5a20d81a43425dae8a63ab581eea7864c25c8.tar.gz | |
Merge from mysql-5.0
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0purge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c index 9e09efc82b2..6fe5855ebfa 100644 --- a/storage/innobase/trx/trx0purge.c +++ b/storage/innobase/trx/trx0purge.c @@ -1022,7 +1022,7 @@ trx_purge(void) { que_thr_t* thr; /* que_thr_t* thr2; */ - ulint old_pages_handled; + ulonglong old_pages_handled; mutex_enter(&(purge_sys->mutex)); @@ -1116,7 +1116,7 @@ trx_purge(void) (ulong) purge_sys->n_pages_handled); } - return(purge_sys->n_pages_handled - old_pages_handled); + return((ulint) (purge_sys->n_pages_handled - old_pages_handled)); } /********************************************************************** |