diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-02-04 16:25:13 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-02-04 16:25:13 +0200 |
| commit | ed4dbd12d976800b4bc42aeda4817bd4942c615b (patch) | |
| tree | 1411d1bdb2fcbc4ab70938c2d2f7bff30bfc96fe /innobase/include/sync0sync.h | |
| parent | aee7a9d7ed21bf3deba6b5f1195b8d06fd917f92 (diff) | |
| download | mariadb-git-ed4dbd12d976800b4bc42aeda4817bd4942c615b.tar.gz | |
InnoDB: Exclude code from InnoDB Hot Backup builds
by adding #ifndef UNIV_HOTBACKUP and adjusting some function
declarations.
innobase/data/data0type.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/dict/dict0dict.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/dict/dict0load.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/data0type.ic:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/srv0srv.h:
Introduce srv_init(), so that it can be called in InnoDB Hot Backup
innobase/include/srv0start.h:
Introduce srv_add_path_separator_if_needed(), so that it can be
invoked in InnoDB Hot Backup
innobase/include/sync0sync.h:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/sync0sync.ic:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/include/trx0trx.h:
trx_recover_for_mysql(): replace uint with ulint, as uint is not
declared in InnoDB Hot Backup
innobase/lock/lock0lock.c:
Replace bool with ibool
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/row/row0ins.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/row/row0mysql.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/srv/srv0srv.c:
Make srv_init() global, so that InnoDB Hot Backup can call it.
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/srv/srv0start.c:
Make srv_add_path_separator_if_needed() global for InnoDB Hot Backup.
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/sync/sync0rw.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/sync/sync0sync.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/trx/trx0roll.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
innobase/trx/trx0trx.c:
Replace uint with ulint, as uint is undeclared in InnoDB Hot Backup
innobase/ut/ut0ut.c:
Exclude code from InnoDB Hot Backup with #ifndef UNIV_HOTBACKUP
Diffstat (limited to 'innobase/include/sync0sync.h')
| -rw-r--r-- | innobase/include/sync0sync.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/include/sync0sync.h b/innobase/include/sync0sync.h index 5046a960bcf..c798c047fa3 100644 --- a/innobase/include/sync0sync.h +++ b/innobase/include/sync0sync.h @@ -17,7 +17,9 @@ Created 9/5/1995 Heikki Tuuri #include "os0sync.h" #include "sync0arr.h" +#ifndef UNIV_HOTBACKUP extern my_bool timed_mutexes; +#endif /* UNIV_HOTBACKUP */ /********************************************************************** Initializes the synchronization data structures. */ @@ -475,6 +477,7 @@ struct mutex_struct { const char* cfile_name;/* File name where mutex created */ ulint cline; /* Line where created */ ulint magic_n; +#ifndef UNIV_HOTBACKUP ulong count_using; /* count of times mutex used */ ulong count_spin_loop; /* count of spin loops */ ulong count_spin_rounds; /* count of spin rounds */ @@ -484,6 +487,7 @@ struct mutex_struct { ulonglong lmax_spent_time; /* mutex os_wait timer msec */ const char* cmutex_name;/* mutex name */ ulint mutex_type;/* 0 - usual mutex 1 - rw_lock mutex */ +#endif /* !UNIV_HOTBACKUP */ }; #define MUTEX_MAGIC_N (ulint)979585 |