diff options
| author | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-03-28 13:59:06 +1100 |
|---|---|---|
| committer | Sunny Bains <Sunny.Bains@Oracle.Com> | 2012-03-28 13:59:06 +1100 |
| commit | 1e10b606292d7b1cf53a2665a7e4760e1aa36974 (patch) | |
| tree | e5d4c46cc9f42aa47699165a0dd5269f49052947 /storage | |
| parent | daf4107355221f0b7cffb84d449089115da85a63 (diff) | |
| parent | 83a5a20d81a43425dae8a63ab581eea7864c25c8 (diff) | |
| download | mariadb-git-1e10b606292d7b1cf53a2665a7e4760e1aa36974.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/trx0purge.h | 4 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0purge.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h index 0b83a76cab7..2bd9e64476b 100644 --- a/storage/innobase/include/trx0purge.h +++ b/storage/innobase/include/trx0purge.h @@ -143,9 +143,9 @@ struct trx_purge_struct{ obtaining an s-latch here. */ read_view_t* view; /*!< The purge will not remove undo logs which are >= this view (purge view) */ - ulint n_pages_handled;/*!< Approximate number of undo log + ulonglong n_pages_handled;/*!< Approximate number of undo log pages processed in purge */ - ulint handle_limit; /*!< Target of how many pages to get + ulonglong handle_limit; /*!< Target of how many pages to get processed in the current purge */ /*------------------------------*/ /* The following two fields form the 'purge pointer' which advances diff --git a/storage/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c index 2370d3deab0..96f01ea81b5 100644 --- a/storage/innobase/trx/trx0purge.c +++ b/storage/innobase/trx/trx0purge.c @@ -1202,7 +1202,7 @@ trx_purge( (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)); } /******************************************************************//** |