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/srv0start.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/srv0start.h')
| -rw-r--r-- | storage/innobase/include/srv0start.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index 3b7b2375788..fb41ae50d2a 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -71,7 +71,7 @@ char* srv_add_path_separator_if_needed( /*=============================*/ char* str); /*!< in: null-terminated character string */ -#ifndef UNIV_HOTBACKUP + /****************************************************************//** Starts Innobase and creates a new database if database files are not found and the user wants. @@ -156,7 +156,6 @@ extern bool srv_startup_is_before_trx_rollback_phase; /** TRUE if a raw partition is in use */ extern ibool srv_start_raw_disk_in_use; - /** Shutdown state */ enum srv_shutdown_t { SRV_SHUTDOWN_NONE = 0, /*!< Database running normally */ @@ -176,6 +175,4 @@ enum srv_shutdown_t { /** At a shutdown this value climbs from SRV_SHUTDOWN_NONE to SRV_SHUTDOWN_CLEANUP and then to SRV_SHUTDOWN_LAST_PHASE, and so on */ extern enum srv_shutdown_t srv_shutdown_state; -#endif /* !UNIV_HOTBACKUP */ - #endif |