diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-06 10:14:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-06 10:14:45 +0300 |
| commit | 9aeb3309afd6984521d1eba96ffe308b9281a324 (patch) | |
| tree | e84ad9d9adfc804142a947bbf6ea1fc014a793ca /storage/innobase/buf/buf0buddy.c | |
| parent | 0c5106fc65b5cc3bcdcbd915775639335c413fd0 (diff) | |
| parent | 7f48c174f0b589f307c54f2bab28a465ffc92468 (diff) | |
| download | mariadb-git-9aeb3309afd6984521d1eba96ffe308b9281a324.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/buf/buf0buddy.c')
| -rw-r--r-- | storage/innobase/buf/buf0buddy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c index b11bf02c747..30c31dd71a0 100644 --- a/storage/innobase/buf/buf0buddy.c +++ b/storage/innobase/buf/buf0buddy.c @@ -330,7 +330,6 @@ buf_buddy_relocate( { buf_page_t* bpage; const ulint size = BUF_BUDDY_LOW << i; - ullint usec = ut_time_us(NULL); mutex_t* mutex; ulint space; ulint page_no; @@ -397,6 +396,7 @@ buf_buddy_relocate( if (buf_page_can_relocate(bpage)) { /* Relocate the compressed page. */ + ullint usec = ut_time_us(NULL); ut_a(bpage->zip.data == src); memcpy(dst, src, size); bpage->zip.data = dst; |