diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 09:33:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 09:33:26 +0100 |
| commit | 27d45e46968e4bd623565688a997b83b0a5cc1a8 (patch) | |
| tree | 8df9c87f8fd3855d81e3ae46078d34609668e63a /storage/innobase/pars/pars0pars.cc | |
| parent | 27fbb637d36324992b270f0dc0472807ffa4ebc2 (diff) | |
| download | mariadb-git-27d45e46968e4bd623565688a997b83b0a5cc1a8.tar.gz | |
MDEV-5574 Set AUTO_INCREMENT below max value of column.
Update InnoDB to 5.6.14
Apply MySQL-5.6 hack for MySQL Bug#16434374
Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB)
Fix InnoDB memory leak
Diffstat (limited to 'storage/innobase/pars/pars0pars.cc')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index f82610e62d0..e0bc00fad0d 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, +Fifth Floor, Boston, MA 02110-1301 USA *****************************************************************************/ |