1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1.

Browse Source
This commit is contained in:
Sunny Bains 2012-03-28 13:59:06 +11:00
commit fc520129a1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/include/trx0purge.h
View File

@ -143,9 +143,9 @@ struct trx_purge_struct{
obtaining an s-latch here. */ obtaining an s-latch here. */
read_view_t* view; /*!< The purge will not remove undo logs read_view_t* view; /*!< The purge will not remove undo logs
which are >= this view (purge view) */ 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 */ 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 */ processed in the current purge */
/*------------------------------*/ /*------------------------------*/
/* The following two fields form the 'purge pointer' which advances /* The following two fields form the 'purge pointer' which advances

2
storage/innobase/trx/trx0purge.c
View File

@ -1202,7 +1202,7 @@ trx_purge(
(ulong) purge_sys->n_pages_handled); (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));
} }
/******************************************************************//** /******************************************************************//**