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/mach0data.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/mach0data.ic')
| -rw-r--r-- | storage/innobase/include/mach0data.ic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/include/mach0data.ic b/storage/innobase/include/mach0data.ic index fffef87f09d..7449d2da2b8 100644 --- a/storage/innobase/include/mach0data.ic +++ b/storage/innobase/include/mach0data.ic @@ -873,6 +873,8 @@ mach_read_ulint( default: ut_error; } + + return(0); } #endif /* !UNIV_HOTBACKUP */ |