← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/myisam/mi_packrec.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/myisam/mi_packrec.c
1
 
/* Copyright (C) 2000-2006 MySQL AB
 
1
/*
 
2
   Copyright (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc.
 
3
   Use is subject to license terms.
2
4
 
3
5
   This program is free software; you can redistribute it and/or modify
4
6
   it under the terms of the GNU General Public License as published by
11
13
 
12
14
   You should have received a copy of the GNU General Public License
13
15
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
16
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
17
*/
15
18
 
16
19
        /* Functions to compressed records */
17
20
 
1550
1553
 
1551
1554
void _mi_unmap_file(MI_INFO *info)
1552
1555
{
1553
 
  VOID(my_munmap((char*) info->s->file_map, 
1554
 
                 (size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN));
 
1556
  DBUG_ASSERT(info->s->options & HA_OPTION_COMPRESS_RECORD);
 
1557
 
 
1558
  VOID(my_munmap((char*) info->s->file_map, (size_t) info->s->mmaped_length));
1555
1559
 
1556
1560
  if (myisam_mmap_size != SIZE_T_MAX)
1557
1561
  {
1558
1562
    pthread_mutex_lock(&THR_LOCK_myisam_mmap);
1559
 
    myisam_mmap_used-= info->s->mmaped_length + MEMMAP_EXTRA_MARGIN;
 
1563
    myisam_mmap_used-= info->s->mmaped_length;
1560
1564
    pthread_mutex_unlock(&THR_LOCK_myisam_mmap);
1561
1565
  }
1562
1566
}