summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-10 14:21:57 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-10 14:21:57 +0300
commitdf905524b218de07dddf5fa394af96edcc4ca483 (patch)
tree1f7c7c41f20d774f34ac3567ac8cd07f6995100c /storage
parent7dcf0a66fdcd098fb6f8700712595bbaeb4e3cbf (diff)
parentaf90fc04ffe1770cf1e2dc22abc8cad235b83d8d (diff)
downloadmariadb-git-df905524b218de07dddf5fa394af96edcc4ca483.tar.gz
merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/include/trx0purge.h4
-rw-r--r--storage/innobase/trx/trx0purge.c4
-rw-r--r--storage/innodb_plugin/include/trx0purge.h4
-rw-r--r--storage/innodb_plugin/trx/trx0purge.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index c4aab91a93a..fbae7eb9a6d 100644
--- a/storage/innobase/include/trx0purge.h
+++ b/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
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));
}
/**********************************************************************
diff --git a/storage/innodb_plugin/include/trx0purge.h b/storage/innodb_plugin/include/trx0purge.h
index 908760580f6..37d3795efb0 100644
--- a/storage/innodb_plugin/include/trx0purge.h
+++ b/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
diff --git a/storage/innodb_plugin/trx/trx0purge.c b/storage/innodb_plugin/trx/trx0purge.c
index 1a70750083a..56607c9ff93 100644
--- a/storage/innodb_plugin/trx/trx0purge.c
+++ b/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));
}
/******************************************************************//**