summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
diff options
context:
space:
mode:
authorSunny Bains <Sunny.Bains@Oracle.Com>2012-03-28 13:59:06 +1100
committerSunny Bains <Sunny.Bains@Oracle.Com>2012-03-28 13:59:06 +1100
commit1e10b606292d7b1cf53a2665a7e4760e1aa36974 (patch)
treee5d4c46cc9f42aa47699165a0dd5269f49052947 /storage/innobase/trx
parentdaf4107355221f0b7cffb84d449089115da85a63 (diff)
parent83a5a20d81a43425dae8a63ab581eea7864c25c8 (diff)
downloadmariadb-git-1e10b606292d7b1cf53a2665a7e4760e1aa36974.tar.gz
Merge from mysql-5.1.
Diffstat (limited to 'storage/innobase/trx')
-rw-r--r--storage/innobase/trx/trx0purge.c2
1 files changed, 1 insertions, 1 deletions
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));
}
/******************************************************************//**