~ubuntu-branches/ubuntu/maverick/mysql-5.1/maverick-proposed

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/include/row0upd.ic

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 14:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 20.
  • Revision ID: package-import@ubuntu.com-20120222141605-nxlu9yzc6attylc2
Tags: upstream-5.1.61
ImportĀ upstreamĀ versionĀ 5.1.61

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1996, 2011, Oracle and/or its affiliates. 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
28
28
# include "trx0trx.h"
29
29
# include "trx0undo.h"
30
30
# include "row0row.h"
31
 
# include "btr0sea.h"
32
31
#endif /* !UNIV_HOTBACKUP */
33
32
#include "page0zip.h"
34
33
 
157
156
{
158
157
        ut_ad(dict_index_is_clust(index));
159
158
        ut_ad(rec_offs_validate(rec, index, offsets));
160
 
#ifdef UNIV_SYNC_DEBUG
161
 
        if (!rw_lock_own(&btr_search_latch, RW_LOCK_EX)) {
162
 
                ut_ad(!buf_block_align(rec)->is_hashed);
163
 
        }
164
 
#endif /* UNIV_SYNC_DEBUG */
165
159
 
166
160
        if (UNIV_LIKELY_NULL(page_zip)) {
167
161
                ulint   pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID);
171
165
                ulint   offset = index->trx_id_offset;
172
166
 
173
167
                if (!offset) {
174
 
                        offset = row_get_trx_id_offset(rec, index, offsets);
 
168
                        offset = row_get_trx_id_offset(index, offsets);
175
169
                }
176
170
 
177
171
#if DATA_TRX_ID + 1 != DATA_ROLL_PTR