← 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/include/buf0buddy.h

  • 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/include/buf0buddy.h
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 2006, 2009, Innobase Oy. All Rights Reserved.
 
3
Copyright (c) 2006, 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
37
37
/**********************************************************************//**
38
38
Allocate a block.  The thread calling this function must hold
39
39
buf_pool_mutex and must not hold buf_pool_zip_mutex or any
40
 
block->mutex.  The buf_pool_mutex may only be released and reacquired
41
 
if lru != NULL.  This function should only be used for allocating
42
 
compressed page frames or control blocks (buf_page_t).  Allocated
43
 
control blocks must be properly initialized immediately after
44
 
buf_buddy_alloc() has returned the memory, before releasing
45
 
buf_pool_mutex.
46
 
@return allocated block, possibly NULL if lru == NULL */
 
40
block->mutex.  The buf_pool_mutex may be released and reacquired.
 
41
This function should only be used for allocating compressed page frames.
 
42
@return allocated block, never NULL */
47
43
UNIV_INLINE
48
44
void*
49
45
buf_buddy_alloc(
50
46
/*============*/
51
 
        ulint   size,   /*!< in: block size, up to UNIV_PAGE_SIZE */
 
47
        ulint   size,   /*!< in: compressed page size
 
48
                        (between PAGE_ZIP_MIN_SIZE and UNIV_PAGE_SIZE) */
52
49
        ibool*  lru)    /*!< in: pointer to a variable that will be assigned
53
50
                        TRUE if storage was allocated from the LRU list
54
 
                        and buf_pool_mutex was temporarily released,
55
 
                        or NULL if the LRU list should not be used */
56
 
        __attribute__((malloc));
57
 
 
 
51
                        and buf_pool_mutex was temporarily released */
 
52
        __attribute__((malloc, nonnull));
58
53
/**********************************************************************//**
59
54
Release a block. */
60
55
UNIV_INLINE