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/data | |
| 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/data')
| -rw-r--r-- | innobase/data/data0type.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/innobase/data/data0type.c b/innobase/data/data0type.c index 00048bf6fbb..b1297fe7a5b 100644 --- a/innobase/data/data0type.c +++ b/innobase/data/data0type.c @@ -81,6 +81,7 @@ dtype_get_at_most_n_mbchars( ulint data_len, const char* str) { +#ifndef UNIV_HOTBACKUP ut_a(data_len != UNIV_SQL_NULL); if (dtype_str_needs_mysql_cmp(dtype)) { @@ -99,6 +100,12 @@ dtype_get_at_most_n_mbchars( } return(data_len); +#else /* UNIV_HOTBACKUP */ + /* This function depends on MySQL code that is not included in + InnoDB Hot Backup builds. Besides, this function should never + be called in InnoDB Hot Backup. */ + ut_error; +#endif /* UNIV_HOTBACKUP */ } /************************************************************************* |