Merge from mysql-5.1.
This commit is contained in:
commit
fc520129a1
@ -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
|
||||
|
@ -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));
|
||||
}
|
||||
|
||||
/******************************************************************//**
|
||||
|
Loading…
x
Reference in New Issue
Block a user