← Back to branch summary

~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-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 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

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