diff options
| author | unknown <sanja@montyprogram.com> | 2013-07-17 17:03:59 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-07-17 17:03:59 +0300 |
| commit | c7973615e723b13c6457b494b72be2fac35bfd18 (patch) | |
| tree | 7ba91d16cc52816f351a3ddf6b3da5badd6ec1bf /storage/xtradb/trx | |
| parent | 66ec79fc87da6fea5bed2e5a6d9881c306d9e8fa (diff) | |
| download | mariadb-git-c7973615e723b13c6457b494b72be2fac35bfd18.tar.gz | |
Revert of marko.makela@oracle.com-20130430103950-j353faze84zzk9xf for xtradb
(fix of http://bugs.mysql.com/bug.php?id=69623)
Diffstat (limited to 'storage/xtradb/trx')
| -rw-r--r-- | storage/xtradb/trx/trx0sys.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/xtradb/trx/trx0sys.c b/storage/xtradb/trx/trx0sys.c index a56e55c0e19..ef00bc0a1f0 100644 --- a/storage/xtradb/trx/trx0sys.c +++ b/storage/xtradb/trx/trx0sys.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -726,8 +726,7 @@ trx_sys_doublewrite_init_or_restore_pages( /* Check if the page is corrupt */ if (UNIV_UNLIKELY - (buf_page_is_corrupted( - TRUE, read_buf, zip_size))) { + (buf_page_is_corrupted(read_buf, zip_size))) { fprintf(stderr, "InnoDB: Warning: database page" @@ -738,8 +737,7 @@ trx_sys_doublewrite_init_or_restore_pages( " the doublewrite buffer.\n", (ulong) space_id, (ulong) page_no); - if (buf_page_is_corrupted( - TRUE, page, zip_size)) { + if (buf_page_is_corrupted(page, zip_size)) { fprintf(stderr, "InnoDB: Dump of the page:\n"); buf_page_print( |