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/fsp/fsp0sysspace.cc | |
| 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/fsp/fsp0sysspace.cc')
| -rw-r--r-- | storage/innobase/fsp/fsp0sysspace.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/storage/innobase/fsp/fsp0sysspace.cc b/storage/innobase/fsp/fsp0sysspace.cc index ac34be6f6a8..fa6a46890db 100644 --- a/storage/innobase/fsp/fsp0sysspace.cc +++ b/storage/innobase/fsp/fsp0sysspace.cc @@ -29,7 +29,6 @@ Refactored 2013-7-26 by Kevin Lewis #include "fsp0sysspace.h" #include "srv0start.h" #include "trx0sys.h" -#ifndef UNIV_HOTBACKUP #include "dict0load.h" #include "mem0mem.h" #include "os0file.h" @@ -40,9 +39,6 @@ Refactored 2013-7-26 by Kevin Lewis If server passes the option for create/open DB to SE, we should remove such direct reference to server header and global variable */ #include "mysqld.h" -#else -my_bool opt_initialize = 0; -#endif /* !UNIV_HOTBACKUP */ /** The control info of the system tablespace. */ SysTablespace srv_sys_space; @@ -538,7 +534,6 @@ SysTablespace::open_file( return(err); } -#ifndef UNIV_HOTBACKUP /** Check the tablespace header for this tablespace. @param[out] flushed_lsn the value of FIL_PAGE_FILE_FLUSH_LSN @return DB_SUCCESS or error code */ @@ -613,7 +608,7 @@ SysTablespace::read_lsn_and_check_flags(lsn_t* flushed_lsn) return(DB_SUCCESS); } -#endif /* !UNIV_HOTBACKUP */ + /** Check if a file can be opened in the correct mode. @param[in] file data file object @param[out] reason exact reason if file_status check failed. @@ -760,7 +755,7 @@ SysTablespace::file_found( /* Need to create the system tablespace for new raw device. */ return(file.m_type == SRV_NEW_RAW); } -#ifndef UNIV_HOTBACKUP + /** Check the data file specification. @param[out] create_new_db true if a new database is to be created @param[in] min_expected_size Minimum expected tablespace size in bytes @@ -989,7 +984,7 @@ SysTablespace::open_or_create( return(err); } -#endif /* UNIV_HOTBACKUP */ + /** Normalize the file size, convert from megabytes to number of pages. */ void SysTablespace::normalize() |