diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 15:04:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 16:05:42 +0200 |
| commit | 63574f1275eda0f0ed439f4896b6e7daf6832a8f (patch) | |
| tree | aead50be1af894234be2be8d06c341e328bf8636 /storage/innobase/include/mem0mem.h | |
| parent | 9ebd76733198578e0ac8ca854d667ab114b3d581 (diff) | |
| download | mariadb-git-63574f1275eda0f0ed439f4896b6e7daf6832a8f.tar.gz | |
MDEV-11690 Remove UNIV_HOTBACKUP
The InnoDB source code contains quite a few references to a closed-source
hot backup tool which was originally called InnoDB Hot Backup (ibbackup)
and later incorporated in MySQL Enterprise Backup.
The open source backup tool XtraBackup uses the full database for recovery.
So, the references to UNIV_HOTBACKUP are only cluttering the source code.
Diffstat (limited to 'storage/innobase/include/mem0mem.h')
| -rw-r--r-- | storage/innobase/include/mem0mem.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h index f8fdb53e132..991d1179098 100644 --- a/storage/innobase/include/mem0mem.h +++ b/storage/innobase/include/mem0mem.h @@ -390,7 +390,7 @@ struct mem_block_info_t { user data in the block */ ulint start; /*!< the value of the struct field 'free' at the creation of the block */ -#ifndef UNIV_HOTBACKUP + void* free_block; /* if the MEM_HEAP_BTR_SEARCH bit is set in type, and this is the heap root, this can contain an @@ -401,7 +401,6 @@ struct mem_block_info_t { /* if this block has been allocated from the buffer pool, this contains the buf_block_t handle; otherwise, this is NULL */ -#endif /* !UNIV_HOTBACKUP */ }; #define MEM_BLOCK_MAGIC_N 764741555 |