← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

Viewing changes to storage/innodb_plugin/page/page0cur.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20120222223355-or06x1euyk8n0ldi
Tags: 5.1.61-0ubuntu0.10.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
* Dropped patches unnecessary with 5.1.61:
  - debian/patches/90_mysql_safer_strmov.dpatch
  - debian/patches/51_ssl_test_certs.dpatch
  - debian/patches/52_CVE-2009-4030.dpatch
  - debian/patches/53_CVE-2009-4484.dpatch
  - debian/patches/54_CVE-2008-7247.dpatch
  - debian/patches/55_CVE-2010-1621.dpatch
  - debian/patches/56_CVE-2010-1850.dpatch
  - debian/patches/57_CVE-2010-1849.dpatch
  - debian/patches/58_CVE-2010-1848.dpatch
  - debian/patches/59_CVE-2010-1626.dpatch
  - debian/patches/60_CVE-2010-2008.dpatch
  - debian/patches/60_CVE-2010-3677.dpatch
  - debian/patches/60_CVE-2010-3678.dpatch
  - debian/patches/60_CVE-2010-3679.dpatch
  - debian/patches/60_CVE-2010-3680.dpatch
  - debian/patches/60_CVE-2010-3681.dpatch
  - debian/patches/60_CVE-2010-3682.dpatch
  - debian/patches/60_CVE-2010-3683.dpatch
  - debian/patches/60_CVE-2010-3833.dpatch
  - debian/patches/60_CVE-2010-3834.dpatch
  - debian/patches/60_CVE-2010-3835.dpatch
  - debian/patches/60_CVE-2010-3836.dpatch
  - debian/patches/60_CVE-2010-3837.dpatch
  - debian/patches/60_CVE-2010-3838.dpatch
  - debian/patches/60_CVE-2010-3839.dpatch
  - debian/patches/60_CVE-2010-3840.dpatch
  - debian/patches/61_disable_longfilename_test.dpatch
  - debian/patches/62_alter_table_fix.dpatch
  - debian/patches/63_cherrypick-upstream-49479.dpatch
  - debian/patches/10_readline_build_fix.dpatch
* debian/mysql-client-5.1.docs: removed EXCEPTIONS-CLIENT file
* debian/mysql-server-5.1.docs,debian/libmysqlclient16.docs,
  debian/libmysqlclient-dev.docs: removed, no longer necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innodb_plugin/page/page0cur.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1994, 2009, 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
1149
1149
                                              current_rec, index, mtr);
1150
1150
        }
1151
1151
 
 
1152
        btr_blob_dbg_add_rec(insert_rec, index, offsets, "insert");
 
1153
 
1152
1154
        return(insert_rec);
1153
1155
}
1154
1156
 
1195
1197
        }
1196
1198
 
1197
1199
        /* Out of space: restore the page */
 
1200
        btr_blob_dbg_remove(page, index, "insert_zip_fail");
1198
1201
        if (!page_zip_decompress(page_zip, page, FALSE)) {
1199
1202
                ut_error; /* Memory corrupted? */
1200
1203
        }
1201
1204
        ut_ad(page_validate(page, index));
 
1205
        btr_blob_dbg_add(page, index, "insert_zip_fail");
1202
1206
        return(NULL);
1203
1207
}
1204
1208
 
1490
1494
 
1491
1495
        page_zip_write_rec(page_zip, insert_rec, index, offsets, 1);
1492
1496
 
 
1497
        btr_blob_dbg_add_rec(insert_rec, index, offsets, "insert_zip_ok");
 
1498
 
1493
1499
        /* 9. Write log record of the insert */
1494
1500
        if (UNIV_LIKELY(mtr != NULL)) {
1495
1501
                page_cur_insert_rec_write_log(insert_rec, rec_size,
1697
1703
 
1698
1704
                heap_top += rec_size;
1699
1705
 
 
1706
                rec_offs_make_valid(insert_rec, index, offsets);
 
1707
                btr_blob_dbg_add_rec(insert_rec, index, offsets, "copy_end");
 
1708
 
1700
1709
                page_cur_insert_rec_write_log(insert_rec, rec_size, prev_rec,
1701
1710
                                              index, mtr);
1702
1711
                prev_rec = insert_rec;
1944
1953
        page_dir_slot_set_n_owned(cur_dir_slot, page_zip, cur_n_owned - 1);
1945
1954
 
1946
1955
        /* 6. Free the memory occupied by the record */
 
1956
        btr_blob_dbg_remove_rec(current_rec, index, offsets, "delete");
1947
1957
        page_mem_free(page, page_zip, current_rec, index, offsets);
1948
1958
 
1949
1959
        /* 7. Now we have decremented the number of owned records of the slot.