diff options
| author | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
| commit | e744c687ca2c2523b63d5ac0066276a6cb3e932f (patch) | |
| tree | 7d3fbd9457d9a6f074d4c8dbb925fcb65730e135 /storage/maria/ma_blockrec.c | |
| parent | 5797cbaf4ab93cdae191486c6c82be79b83c56d2 (diff) | |
| parent | a816aa066e5c879a92819d694a93d245e6ec6e47 (diff) | |
| download | mariadb-git-e744c687ca2c2523b63d5ac0066276a6cb3e932f.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'storage/maria/ma_blockrec.c')
| -rw-r--r-- | storage/maria/ma_blockrec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index c4ec3cf2f9a..c0a93415379 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -271,6 +271,7 @@ #include "maria_def.h" #include "ma_blockrec.h" #include "trnman.h" +#include "ma_trnman.h" #include "ma_key_recover.h" #include "ma_recovery_util.h" #include <lf.h> @@ -7525,7 +7526,7 @@ void maria_ignore_trids(MARIA_HA *info) if (info->s->base.born_transactional) { if (!info->trn) - _ma_set_trn_for_table(info, &dummy_transaction_object); + _ma_set_tmp_trn_for_table(info, &dummy_transaction_object); /* Ignore transaction id when row is read */ info->trn->min_read_from= ~(TrID) 0; } |