← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/rem/rem0rec.c

  • 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:
storage/innodb_plugin/rem/rem0rec.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 1994, 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
408
408
                do {
409
409
                        ulint   len;
410
410
                        if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
411
 
                                len = offs += 4;
 
411
                                len = offs += REC_NODE_PTR_SIZE;
412
412
                                goto resolved;
413
413
                        }
414
414
 
640
640
        do {
641
641
                ulint   len;
642
642
                if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
643
 
                        len = offs += 4;
 
643
                        len = offs += REC_NODE_PTR_SIZE;
644
644
                        goto resolved;
645
645
                }
646
646
 
1131
1131
 
1132
1132
                if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
1133
1133
                        ut_ad(dtype_get_prtype(type) & DATA_NOT_NULL);
1134
 
                        ut_ad(len == 4);
 
1134
                        ut_ad(len == REC_NODE_PTR_SIZE);
1135
1135
                        memcpy(end, dfield_get_data(field), len);
1136
 
                        end += 4;
 
1136
                        end += REC_NODE_PTR_SIZE;
1137
1137
                        break;
1138
1138
                }
1139
1139