diff options
| author | marko@hundin.mysql.fi <> | 2005-02-04 16:25:13 +0200 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2005-02-04 16:25:13 +0200 |
| commit | 6c43fb504b97b9cef735c603c090f4a8cc0e0bfb (patch) | |
| tree | 1411d1bdb2fcbc4ab70938c2d2f7bff30bfc96fe /innobase/trx | |
| parent | 96bbd613c92030864d96b7d6c496965b7ec3da40 (diff) | |
| download | mariadb-git-6c43fb504b97b9cef735c603c090f4a8cc0e0bfb.tar.gz | |
InnoDB: Exclude code from InnoDB Hot Backup builds
by adding #ifndef UNIV_HOTBACKUP and adjusting some function
declarations.
Diffstat (limited to 'innobase/trx')
| -rw-r--r-- | innobase/trx/trx0roll.c | 9 | ||||
| -rw-r--r-- | innobase/trx/trx0trx.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c index cba3040fd0e..e57057de7ff 100644 --- a/innobase/trx/trx0roll.c +++ b/innobase/trx/trx0roll.c @@ -52,6 +52,7 @@ trx_general_rollback_for_mysql( trx_savept_t* savept) /* in: pointer to savepoint undo number, if partial rollback requested */ { +#ifndef UNIV_HOTBACKUP mem_heap_t* heap; que_thr_t* thr; roll_node_t* roll_node; @@ -103,6 +104,12 @@ trx_general_rollback_for_mysql( srv_active_wake_master_thread(); return((int) trx->error_state); +#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 */ } /*********************************************************************** @@ -322,7 +329,7 @@ were set after this savepoint are deleted. */ ulint trx_release_savepoint_for_mysql( -/*================================*/ +/*============================*/ /* out: if no savepoint of the name found then DB_NO_SAVEPOINT, diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 6619286ee71..f254f3ff904 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -1844,7 +1844,7 @@ trx_recover_for_mysql( /* out: number of prepared transactions stored in xid_list */ XID* xid_list, /* in/out: prepared transactions */ - uint len) /* in: number of slots in xid_list */ + ulint len) /* in: number of slots in xid_list */ { trx_t* trx; int num_of_transactions = 0; |