diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
| commit | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (patch) | |
| tree | e7fc2258c06a0fdab1cce115de4d71a091d82d28 /storage/innobase/trx/trx0roll.cc | |
| parent | 765ae6e82165d1bc4cf6cc9f0d556d66a5e172d1 (diff) | |
| parent | bc145193c164b895a52b943e73fff53952d48a60 (diff) | |
| download | mariadb-git-acf6f92aa936fbfe7524617ae57d011ab8f1f96d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/trx/trx0roll.cc')
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 9e992d2f145..2bff7495c1b 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2018, MariaDB Corporation. +Copyright (c) 2016, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -236,6 +236,7 @@ dberr_t trx_rollback_for_mysql(trx_t* trx) return(trx_rollback_for_mysql_low(trx)); case TRX_STATE_PREPARED: + case TRX_STATE_PREPARED_RECOVERED: ut_ad(!trx_is_autocommit_non_locking(trx)); if (trx->rsegs.m_redo.undo || trx->rsegs.m_redo.old_insert) { /* Change the undo log state back from @@ -335,6 +336,7 @@ trx_rollback_last_sql_stat_for_mysql( return(err); case TRX_STATE_PREPARED: + case TRX_STATE_PREPARED_RECOVERED: case TRX_STATE_COMMITTED_IN_MEMORY: /* The statement rollback is only allowed on an ACTIVE transaction, not a PREPARED or COMMITTED one. */ @@ -508,6 +510,7 @@ trx_rollback_to_savepoint_for_mysql( trx, savep, mysql_binlog_cache_pos)); case TRX_STATE_PREPARED: + case TRX_STATE_PREPARED_RECOVERED: case TRX_STATE_COMMITTED_IN_MEMORY: /* The savepoint rollback is only allowed on an ACTIVE transaction, not a PREPARED or COMMITTED one. */ |