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/include/dict0priv.ic | |
| 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/include/dict0priv.ic')
| -rw-r--r-- | storage/innobase/include/dict0priv.ic | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/innobase/include/dict0priv.ic b/storage/innobase/include/dict0priv.ic index e15fbc65a63..30ba8fb60aa 100644 --- a/storage/innobase/include/dict0priv.ic +++ b/storage/innobase/include/dict0priv.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2010, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2010, 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 @@ -73,7 +73,9 @@ UNIV_INLINE dict_table_t* dict_table_open_on_id_low( /*======================*/ - table_id_t table_id) /*!< in: table id */ + table_id_t table_id, /*!< in: table id */ + dict_err_ignore_t ignore_err) /*!< in: errors to ignore + when loading the table */ { dict_table_t* table; ulint fold; @@ -87,7 +89,7 @@ dict_table_open_on_id_low( dict_table_t*, table, ut_ad(table->cached), table->id == table_id); if (table == NULL) { - table = dict_load_table_on_id(table_id); + table = dict_load_table_on_id(table_id, ignore_err); } ut_ad(!table || table->cached); |