Merge from mysql-5.0

storage/innobase/include/trx0purge.h

@@ -120,9 +120,9 @@ struct trx_purge_struct{
 	read_view_t*	view;		/* The purge will not remove undo logs
 					which are >= this view (purge view) */
 	mutex_t		mutex;		/* Mutex protecting the fields below */
-	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

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));
 }
 
 /**********************************************************************

storage/innodb_plugin/include/trx0purge.h

@@ -140,9 +140,9 @@ struct trx_purge_struct{
 	read_view_t*	view;		/*!< The purge will not remove undo logs
 					which are >= this view (purge view) */
 	mutex_t		mutex;		/*!< Mutex protecting the fields below */
-	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

storage/innodb_plugin/trx/trx0purge.c

@@ -1085,7 +1085,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));
 
@@ -1179,7 +1179,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));
 }
 
 /******************************************************************//**