~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/page0page.ic

  • Committer: Brian Aker
  • Date: 2010-11-19 20:09:58 UTC
  • mfrom: (1938.2.1 bug673579)
  • Revision ID: brian@tangent.org-20101119200958-anlloqi9va5gu4c7
Merge in Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (C) 1994, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 2009, Innobase Oy. All Rights Reserved.
4
4
 
5
5
This program is free software; you can redistribute it and/or modify it under
6
6
the terms of the GNU General Public License as published by the Free Software
94
94
        TRUE for the dummy indexes constructed during redo log
95
95
        application).  In that case, PAGE_MAX_TRX_ID is unused,
96
96
        and trx_id is usually zero. */
97
 
        ut_ad(trx_id || recv_recovery_is_on());
 
97
        ut_ad(!ut_dulint_is_zero(trx_id) || recv_recovery_is_on());
98
98
        ut_ad(page_is_leaf(buf_block_get_frame(block)));
99
99
 
100
 
        if (page_get_max_trx_id(buf_block_get_frame(block)) < trx_id) {
 
100
        if (ut_dulint_cmp(page_get_max_trx_id(buf_block_get_frame(block)),
 
101
                          trx_id) < 0) {
101
102
 
102
103
                page_set_max_trx_id(block, page_zip, trx_id, mtr);
103
104
        }