← Back to branch summary

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

« back to all changes in this revision

Viewing changes to storage/myisammrg/ha_myisammrg.cc

  • 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/myisammrg/ha_myisammrg.cc
1
 
/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.
 
1
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2
2
 
3
3
   This program is free software; you can redistribute it and/or modify
4
4
   it under the terms of the GNU General Public License as published by
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
15
*/
15
16
 
16
17
 
17
18
/*
459
460
      problem because all locking is handled by the original MERGE table
460
461
      from which this is cloned of.
461
462
    */
462
 
    if (!(file= myrg_open(table->s->normalized_path.str, table->db_stat, 
463
 
                                       HA_OPEN_IGNORE_IF_LOCKED)))
 
463
    if (!(file= myrg_open(name, table->db_stat, HA_OPEN_IGNORE_IF_LOCKED)))
464
464
    {
465
465
      DBUG_PRINT("error", ("my_errno %d", my_errno));
466
466
      DBUG_RETURN(my_errno ? my_errno : -1); 
484
484
 
485
485
   @return A cloned handler instance.
486
486
 */
487
 
handler *ha_myisammrg::clone(MEM_ROOT *mem_root)
 
487
handler *ha_myisammrg::clone(const char *name, MEM_ROOT *mem_root)
488
488
{
489
489
  MYRG_TABLE    *u_table,*newu_table;
490
490
  ha_myisammrg *new_handler= 
505
505
    return NULL;
506
506
  }
507
507
 
508
 
  if (new_handler->ha_open(table, table->s->normalized_path.str, table->db_stat,
509
 
                            HA_OPEN_IGNORE_IF_LOCKED))
 
508
  if (new_handler->ha_open(table, name, table->db_stat,
 
509
                           HA_OPEN_IGNORE_IF_LOCKED))
510
510
  {
511
511
    delete new_handler;
512
512
    return NULL;