diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-29 11:01:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-29 11:05:17 +0200 |
| commit | 706ed8552dbfd147c72d34b63e7de79a9fbedad3 (patch) | |
| tree | 726be4077b89bf2e6916556c619515062220280d /storage/innobase/include/trx0undo.h | |
| parent | d01dbe66a8bf9cb6031f95159c49100f9299a768 (diff) | |
| download | mariadb-git-706ed8552dbfd147c72d34b63e7de79a9fbedad3.tar.gz | |
Revert "MDEV-6928: Add trx pointer to struct mtr_t"
This reverts commit 3486135bb5c9e21fd678821dee35484a81351cfb.
The commit comment ended in the words: "This is needed later."
Apparently the "later" never arrived.
Diffstat (limited to 'storage/innobase/include/trx0undo.h')
| -rw-r--r-- | storage/innobase/include/trx0undo.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h index 42ac62916e0..266ca32548c 100644 --- a/storage/innobase/include/trx0undo.h +++ b/storage/innobase/include/trx0undo.h @@ -246,13 +246,22 @@ Truncates an undo log from the end. This function is used during a rollback to free space from an undo log. */ UNIV_INTERN void -trx_undo_truncate_end( +trx_undo_truncate_end_func( /*=======================*/ - trx_t* trx, /*!< in: transaction whose undo log it is */ +#ifdef UNIV_DEBUG + const trx_t* trx, /*!< in: transaction whose undo log it is */ +#endif /* UNIV_DEBUG */ trx_undo_t* undo, /*!< in/out: undo log */ undo_no_t limit) /*!< in: all undo records with undo number >= this value should be truncated */ MY_ATTRIBUTE((nonnull)); +#ifdef UNIV_DEBUG +# define trx_undo_truncate_end(trx,undo,limit) \ + trx_undo_truncate_end_func(trx,undo,limit) +#else /* UNIV_DEBUG */ +# define trx_undo_truncate_end(trx,undo,limit) \ + trx_undo_truncate_end_func(undo,limit) +#endif /* UNIV_DEBUG */ /***********************************************************************//** Truncates an undo log from the start. This function is used during a purge |