← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mysql-5.5/utopic

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0merge.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-10-24 13:02:18 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20131024130218-kmsafm2gr2fza5k6
Tags: 5.5.34-0ubuntu1
https://launchpad.net/bugs/1243253
* SECURITY UPDATE: Update to 5.5.34 to fix security issues (LP: #1243253)
  - http://www.oracle.com/technetwork/topics/security/cpuoct2013-1899837.html
  - CVE-2013-3839
  - CVE-2013-5807

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/row/row0merge.c
1
1
/*****************************************************************************
2
2
 
3
 
Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved.
 
3
Copyright (c) 1995, 2013, 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
11
11
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
12
12
 
13
13
You should have received a copy of the GNU General Public License along with
14
 
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
15
 
Place, Suite 330, Boston, MA 02111-1307 USA
 
14
this program; if not, write to the Free Software Foundation, Inc., 
 
15
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
*****************************************************************************/
18
18
 
2553
2553
                goto err_exit;
2554
2554
        }
2555
2555
 
2556
 
        err = dict_load_foreigns(old_name, FALSE, TRUE);
 
2556
        err = dict_load_foreigns(old_name, FALSE, TRUE, DICT_ERR_IGNORE_NONE);
2557
2557
 
2558
2558
        if (err != DB_SUCCESS) {
2559
2559
err_exit: