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/ha | |
| 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/ha')
| -rw-r--r-- | storage/innobase/ha/ha0ha.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/ha/hash0hash.cc | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/storage/innobase/ha/ha0ha.cc b/storage/innobase/ha/ha0ha.cc index f57a6d383d9..cf92f22ac15 100644 --- a/storage/innobase/ha/ha0ha.cc +++ b/storage/innobase/ha/ha0ha.cc @@ -28,11 +28,10 @@ Created 8/22/1994 Heikki Tuuri #include "ha0ha.ic" #endif -#ifndef UNIV_HOTBACKUP #ifdef UNIV_DEBUG # include "buf0buf.h" #endif /* UNIV_DEBUG */ -# include "btr0sea.h" +#include "btr0sea.h" #include "page0page.h" /*************************************************************//** @@ -537,4 +536,3 @@ builds, see http://bugs.mysql.com/36941 */ (ulong) n_bufs); } } -#endif /* !UNIV_HOTBACKUP */ diff --git a/storage/innobase/ha/hash0hash.cc b/storage/innobase/ha/hash0hash.cc index 234fd7ac032..7c5798ae254 100644 --- a/storage/innobase/ha/hash0hash.cc +++ b/storage/innobase/ha/hash0hash.cc @@ -32,8 +32,6 @@ Created 5/20/1997 Heikki Tuuri #include "mem0mem.h" #include "sync0sync.h" -#ifndef UNIV_HOTBACKUP - /************************************************************//** Reserves the mutex for a fold value in a hash table. */ void @@ -249,8 +247,6 @@ hash_unlock_x_all_but( } } -#endif /* !UNIV_HOTBACKUP */ - /*************************************************************//** Creates a hash table with >= n array cells. The actual number of cells is chosen to be a prime number slightly bigger than n. @@ -277,14 +273,12 @@ hash_create( table->type = HASH_TABLE_SYNC_NONE; table->array = array; table->n_cells = prime; -#ifndef UNIV_HOTBACKUP -# if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG +#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG table->adaptive = FALSE; -# endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ +#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ table->n_sync_obj = 0; table->sync_obj.mutexes = NULL; table->heaps = NULL; -#endif /* !UNIV_HOTBACKUP */ table->heap = NULL; ut_d(table->magic_n = HASH_TABLE_MAGIC_N); @@ -307,7 +301,6 @@ hash_table_free( ut_free(table); } -#ifndef UNIV_HOTBACKUP /*************************************************************//** Creates a sync object array to protect a hash table. ::sync_obj can be mutexes or rw_locks depening on the type of @@ -362,4 +355,3 @@ hash_create_sync_obj( table->n_sync_obj = n_sync_obj; } -#endif /* !UNIV_HOTBACKUP */ |